Merge branch 'bug_300_fix_arabic'