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