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