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