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