Resolve merge regressions
Resolve merge regressions

dhensby/silverstripe-cms,silverstripe/silverstripe-cms,dhensby/silverstripe-cms,silverstripe/silverstripe-cms,jonom/silverstripe-cms,jonom/silverstripe-cms,dhensby/silverstripe-cms