Merge branch 'MDL-45843-master-fix1' of http://github.com/damyon/moodle