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