Use CollationKeys when sorting text.  Fixes issue 738
Merge remote-tracking branch 'upstream/master'