Fixes: U4-4634 Image preview in Media is stretched
Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5