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