Fixed a log message
Standardising some U::C thigns
locale for sorting can now be overriden at same level as case sentitivity etc.
Merge from dev