Merge branch 'MDL-41756-master' of https://github.com/jamiepratt/moodle