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