am 1f98ca24: (-s ours) Remove deprecated locales - DO NOT MERGE

* commit '1f98ca245c9d99a65bd6954bbc05b082f6846248':
  Remove deprecated locales - DO NOT MERGE