Merge branch 'm38_MDL-67440' of https://github.com/danmarsden/moodle into MOODLE_38_S...