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