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