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