Merge "Remove zh-[cn|tw] in favour of zh-han[s|t]"