Merge in the public updates
release-2.x.y
2017-03-06, Gary Kramlich