Merge branch 'MDL-43856-master-fix1' of https://github.com/damyon/moodle