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