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