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