Merge remote branch 'origin/acid-burn/bug_687_fix_wrong_polish_encodings'