Merge 2.12.0 into default

2017-03-10, Gary Kramlich