Merge branch 'MDL-28679' of git://github.com/timhunt/moodle