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