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