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