Manually applying PR #347
Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.1