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