Merge branch 'MDL-64982-master' of git://github.com/rezaies/moodle