Merge branch 'm27_MDL-46816' of https://github.com/danmarsden/moodle into MOODLE_27_S...