Merge branch 'wip_MDL-50690_master' of git://github.com/gjb2048/moodle