Merge branch 'wip-MDL-39764_M23_3' of git://github.com/gjb2048/moodle into MOODLE_23_...