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