Merge branch 'MDL-55910-31' of https://github.com/LukeCarrier/moodle into MOODLE_31_S...