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