Merge branch 'build/1.x' into development

extensions/chromium/runet-censorship-bypass/src/extension-common/manifest.tmpl.json

@@ -21,6 +21,7 @@
     , "notifications"
     ${extra_permissions}
   ],
+  "minimum_chrome_version": "55.0.0.0",
 
   "background": {
     ${persistent}

extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/ProxyEditor.js

@@ -505,6 +505,7 @@ PROXY foobar.com:8080; # Not HTTP!`.trim()}
 
     return proxyStringRaw
       .replace(/#.*$/mg, '') // Strip comments.
+      .replace(/\s*DIRECT\s*/g, '') // Remove DIRECT from old versions.
       .split( /(?:[^\S\r\n]*(?:;|\r?\n)+[^\S\r\n]*)+/g )
       .map( (p) => p.trim() )
       .filter((p) => p)

extensions/chromium/runet-censorship-bypass/src/templates-data.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const commonContext = {
-  version: '1.0',
+  version: '1.1',
 };
 
 exports.contexts = {};