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