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

Review Request #7714 — Created Oct. 29, 2015 and submitted — Latest diff uploaded

Information

Review Board
f76f474...

Reviewers

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