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