Merge branch 'MDL-41241-master-fix2' of github.com:damyon/moodle