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