Whoops, my last fix was a bit too broad
Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0