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