Merged release-2.x.y into default

2017-11-03, Gary Kramlich