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