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