Merge branch 'MDL-37413-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...