Fixes #U4-2466
Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3