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