Merge "(bug 21660) "Pipe trick" full width commas (with test!)"