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