Merge branch 'wip-MDL-41788_master_3' of git://github.com/gjb2048/moodle