Bug fixes
Merge branch 'master' of github.com:jotham/silverstripe-dataobject-preview