Merge branch 'release-2.0.x'

Review Request #6725 — Created Jan. 2, 2015 and discarded — Latest diff uploaded

Information

Review Board

Reviewers

Merge branch 'release-2.0.x'