Merge branch 'MDL-41761-master' of git://github.com/jamiepratt/moodle