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