Merge branch 'MDL-50611-master' of git://github.com/LukeCarrier/moodle