Merge branch 'MDL-75012-401-5' of https://github.com/andrewnicols/moodle into MOODLE_...