Merge branch 'MDL-73883-master' of https://github.com/andrewnicols/moodle