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