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