Merge branch 'master' into 10797-ruby-2.3

Conflicts:
	build/package-build-dockerfiles/Makefile

diff --cc build/package-build-dockerfiles/Makefile
index 7359acaf26e11e02c1301364c677d5400389b9dd,5fae9dc589412ccdd449335ae1a82d41065c232d..81d1f13031d3bf8db35cb06ba6423d77a170684e
--- 1/build/package-build-dockerfiles/Makefile
--- 2/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@@ -16,7 -16,11 +16,11 @@@ ubuntu1404/generated: common-generated-
        test -d ubuntu1404/generated || mkdir ubuntu1404/generated
        cp -rlt ubuntu1404/generated common-generated/*
  
 -GOTARBALL=go1.7.1.linux-amd64.tar.gz
+ ubuntu1604/generated: common-generated-all
+       test -d ubuntu1604/generated || mkdir ubuntu1604/generated
+       cp -rlt ubuntu1604/generated common-generated/*
+ 
 +GOTARBALL=go1.7.4.linux-amd64.tar.gz
  
  common-generated-all: common-generated/$(GOTARBALL)
  

diff --cc doc/_includes/_install_ruby_and_bundler.liquid
Simple merge