Merge branch 'w29_MDL-27994_m22_creatorcaps' of git://github.com/skodak/moodle