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