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