Base commit
Merge branch 'master' of github.com:nimeso/silverstripe-page-resources