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