Resolves #175 again -- intelligently select chinese locales
merge master
rebuild for prod