Merge branch 'MDL-79698-402' of https://github.com/andrewnicols/moodle into MOODLE_40...