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