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