Merge branch 'MDL-62382-master' of git://github.com/ryanwyllie/moodle