Merge branch 'master' into production

app/views/editor/ForkModal.coffee

@@ -28,6 +28,8 @@ module.exports = class ForkModal extends ModalView
     newModel.unset 'created'
     newModel.unset 'original'
     newModel.unset 'parent'
+    newModel.unset 'i18n'
+    newModel.unset 'i18nCoverage'
     newModel.set 'commitMessage', "Forked from #{@model.get('name')}"
     newModel.set 'name', @$el.find('#fork-model-name').val()
     if @model.schema().properties.permissions

server_setup.coffee

@@ -86,7 +86,7 @@ setupChinaRedirectMiddleware = (app) ->
       geo = geoip.lookup(ip)
       return geo?.country is "CN" and speaksChinese
     else
-      req.chinaVersion = true
+      req.chinaVersion = true if speaksChinese
       return false  # If the user is already redirected, don't redirect them!
 
   app.use (req, res, next) ->