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