(merged from branches/gsoc) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41897 467b73ca-7a2a-4603-9d3b-597d59a354a9