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