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