Merge branch 'release-2.5.x' into release-3.0.x

Review Request #346 — Created Jan. 20, 2017 and updated March 31, 2017, 8:30 a.m. — Latest diff uploaded Jan. 20, 2017, 7:05 a.m.