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