Merge branch 'wip-MDL-43348_master' of git://github.com/gjb2048/moodle