base

Merge change 1258 into donut

* changes:
  Fix 1840639 to support overlays with zz_ZZ. Everything but strings worked fine before but a new default string would generate a build error.