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