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