Merge branch 'release-1.7.x'

Review Request #5096 — Created Dec. 11, 2013 and updated — Latest diff uploaded

Information

Review Board
fe11972...

Reviewers

Merge branch 'release-1.7.x'