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