am 090283cf: (-s ours) Remove deprecated locales - DO NOT MERGE

* commit '090283cfff2a09f1ea960fd2ef87564099027ab0':
  Remove deprecated locales - DO NOT MERGE