Merge branch 'release-3.0.x'

Review Request #8124 — Created June 2, 2016 and submitted — Latest diff uploaded

Information

Review Board
1abcfc3...

Reviewers

Merge branch 'release-3.0.x'