Merge branch 'wip-MDL-48437_MASTER' of git://github.com/jason-platts/moodle