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