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