Merge branch 'MDL-36667-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE