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