Merge pull request #6893 from illume/upstream-generic-locale-packs-0041