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