Merge branch 'master' into 10797-ruby-2.3
authorTom Clegg <tom@curoverse.com>
Fri, 3 Feb 2017 21:13:58 +0000 (16:13 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 3 Feb 2017 21:13:58 +0000 (16:13 -0500)
commit925a1526383299a1ade38a18e616564ab8c38da4
tree376ddaba901e0114c894da1c9887b3940709ffcf
parent49d7a1fbd42359aa0948efd0968349eaf854d6cb
parent74a9decf66adc216d3d8bbb7ee8f6e3704d9590d
Merge branch 'master' into 10797-ruby-2.3

Conflicts:
build/package-build-dockerfiles/Makefile
build/package-build-dockerfiles/Makefile
doc/_includes/_install_ruby_and_bundler.liquid