Batch update
Merge branch 'master' of github.com:Mouseketeers/silverstripe-foundation