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