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