Merge branch 'm30_MDL-51916' of https://github.com/danmarsden/moodle into MOODLE_30_S...