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