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