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