Merge branch 'MDL-43334-master' of git://github.com/damyon/moodle