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