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