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