Merge branch 'master_MDL-54575' of git://github.com/danmarsden/moodle