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