Merge branch 'release-3.0.x'
Review Request #8124 — Created June 2, 2016 and submitted — Latest diff uploaded
Merge branch 'release-3.0.x'
Review Request #8124 — Created June 2, 2016 and submitted — Latest diff uploaded
Merge branch 'release-3.0.x'