Merge "Better character set encoding detection"