Merge branch 'wip-MDL-33928-master' of git://github.com/phalacee/moodle