Avoid double period.
Merge remote-tracking branch 'origin/ospalh-special' into ospalh-special
Do the normalization on Macs, but give me a chance to switch it off.
Merge remote-tracking branch 'origin' into ospalh-special
Deal with unicode noramlization by hand.