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