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