diff --git a/chromium/manifest.json b/chromium/manifest.json
index 905436a216ba..8ffee79fbd75 100644
--- a/chromium/manifest.json
+++ b/chromium/manifest.json
@@ -46,5 +46,5 @@
"storage",
"*://*/*"
],
- "version": "2017.8.17"
+ "version": "2017.8.19"
}
\ No newline at end of file
diff --git a/src/Changelog b/src/Changelog
index ff83ec95f0d5..0007410ba0e7 100644
--- a/src/Changelog
+++ b/src/Changelog
@@ -1,3 +1,8 @@
+2017.8.19
+ * Fix wildcard matching
+ * Remove usage of HTML string assignment
+ * Ruleset updates
+
2017.8.17
* Firefox: Fix localStorage reference for users with cookies disabled
diff --git a/src/META-INF/manifest.mf b/src/META-INF/manifest.mf
index 60f3ed62ce51..4be8a4709a50 100644
--- a/src/META-INF/manifest.mf
+++ b/src/META-INF/manifest.mf
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Name: install.rdf
Digest-Algorithms: MD5 SHA1
-MD5-Digest: ojlK4Pd210lI8flIYTkMsg==
-SHA1-Digest: Jc/TvS7HpicA3Be7D/mz18XNjYE=
+MD5-Digest: Q+5WxHOjuqlcGFVlYB50Hw==
+SHA1-Digest: Wrl3u+Mww108X2cMqAra6HCtHuQ=
Name: chrome.manifest
Digest-Algorithms: MD5 SHA1
@@ -17,8 +17,8 @@ SHA1-Digest: Nc88V8RTLquKg53ez6k1EY4HGTw=
Name: Changelog
Digest-Algorithms: MD5 SHA1
-MD5-Digest: YltviZT0uDUqyOPe7ytiaA==
-SHA1-Digest: ytqBJOWjE9XII/lnsd5smr1ErFI=
+MD5-Digest: Sx66kkYLaYRV6MEnX4SoMw==
+SHA1-Digest: py89b48OS5/PJ4emYzTCMPsGjfk=
Name: chrome/skin/icon-active-48.png
Digest-Algorithms: MD5 SHA1
@@ -30,30 +30,20 @@ Digest-Algorithms: MD5 SHA1
MD5-Digest: EykkJFjpsNoGf/s2FXYWgw==
SHA1-Digest: Y65sMAe8/tAhvaVWqnvGN1fyesc=
-Name: webextension/.eslintrc.json
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: byshp6PjL3bJ/XRWKJn9Zw==
-SHA1-Digest: z9K4ghnqVopoGRneiZPJ8pHdkH8=
-
-Name: webextension/.gitignore
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: XWeVdgY63zGnb1uG1fnh+A==
-SHA1-Digest: kPMioM8gjsVc3H9DOKcItLWjRYk=
-
Name: webextension/background.js
Digest-Algorithms: MD5 SHA1
-MD5-Digest: RUaJ3Sokjd7AffQprRSu3g==
-SHA1-Digest: 3CE7kJ6NIovUpgF/dyLdxz+N+mA=
+MD5-Digest: iEo8Ka3mnq0Xh+GXaiJC7g==
+SHA1-Digest: l6Y7tU2QOwSR/ehzdP9ypq1aG8w=
Name: webextension/devtools-panel.html
Digest-Algorithms: MD5 SHA1
-MD5-Digest: omItnTgX20Du4/8FR0k5ig==
-SHA1-Digest: sGQx17756bCtscT4RHq70RQdU/I=
+MD5-Digest: EYxYGsjNZkCJmx2SNauDGg==
+SHA1-Digest: Ga7SHHFUvJW3V69Kiv/rw4+ERBM=
Name: webextension/devtools-panel.js
Digest-Algorithms: MD5 SHA1
-MD5-Digest: oYZjwQtTtx37rmFXvXSmTw==
-SHA1-Digest: CvPzXJ/wqpM6f+5cFo84j/C+8wk=
+MD5-Digest: kYBvbPH2T7I4ohwWhG/IPA==
+SHA1-Digest: +Dg2GfUtUGUz8NhXxiaYrXAr3cI=
Name: webextension/devtools.html
Digest-Algorithms: MD5 SHA1
@@ -97,8 +87,8 @@ SHA1-Digest: ypvRahH2WCR0HiIdHAltUAU0naA=
Name: webextension/manifest.json
Digest-Algorithms: MD5 SHA1
-MD5-Digest: O/fByyIz+y5VSBNXfNe16w==
-SHA1-Digest: HagNQLPiM15uZnrFxMNiXaqwlmM=
+MD5-Digest: CqMwOFm7v4oqp+A2m79cbw==
+SHA1-Digest: n8hpEPQ0191WXExwCc06mMBdtPc=
Name: webextension/options.css
Digest-Algorithms: MD5 SHA1
@@ -137,8 +127,8 @@ SHA1-Digest: Pn9f97i3AIFlAMf420qZNzvA7DY=
Name: webextension/rules.js
Digest-Algorithms: MD5 SHA1
-MD5-Digest: fScRGtfPPlvNffTE9KstBg==
-SHA1-Digest: 5Z0Kw2H4ecu7C2Y0iCXi/LgG7bg=
+MD5-Digest: Y5JOFJl7QH8C8cM6gTmDgQ==
+SHA1-Digest: lrmOSoqK9h891MqwwuZrhRCbiAo=
Name: webextension/send-message.js
Digest-Algorithms: MD5 SHA1
@@ -152,18 +142,18 @@ SHA1-Digest: Z/NmiEY9rz/7TN/99xdFwzThD1A=
Name: webextension/switch-planner.html
Digest-Algorithms: MD5 SHA1
-MD5-Digest: 3sLltkVsEZj13ihUy8KNZg==
-SHA1-Digest: ZeWMBompoMpUT2DnUlLuH0JYvoc=
+MD5-Digest: 2JisPY8mlSNjpR5Vw3FGjQ==
+SHA1-Digest: 6mXdkHPvuPisuFNmRNy0fvPIK2o=
Name: webextension/switch-planner.js
Digest-Algorithms: MD5 SHA1
-MD5-Digest: K0THQGf3qvcabZSe+gH+Hg==
-SHA1-Digest: hgEBo0/fsSymtC+XHAlwpfRmIiU=
+MD5-Digest: Pun+sibPOPt6vYjqV2P4gA==
+SHA1-Digest: hqr9VWAj9t7f3whDo3xgnsB3V4Q=
Name: webextension/translation.js
Digest-Algorithms: MD5 SHA1
-MD5-Digest: 7IGI0onSi0pdM0bmTb9BZQ==
-SHA1-Digest: 1hsNFGHptz3Q28+JpVYGkJ5L8/8=
+MD5-Digest: 5Ew/qMF7G9ldaviVnM7mOA==
+SHA1-Digest: wFPQy0Q4DwJAPz1UBxCDJ3Ta9LY=
Name: webextension/util.js
Digest-Algorithms: MD5 SHA1
@@ -1075,11 +1065,6 @@ Digest-Algorithms: MD5 SHA1
MD5-Digest: kVfOMXMfs1zX9DJMmR289Q==
SHA1-Digest: 7bN3bVRJgEjqLrqP0YhPohnTfd8=
-Name: webextension/chrome-resources/update-from-chrome-svn.sh
-Digest-Algorithms: MD5 SHA1
-MD5-Digest: J51yWAyktmmyDAjA7VPknw==
-SHA1-Digest: sE0aRAuTrsmagsZSUWo27kMETyc=
-
Name: webextension/chrome-resources/css/chrome_shared.css
Digest-Algorithms: MD5 SHA1
MD5-Digest: 88+Pdhg00hYai96pEZhqRQ==
@@ -1127,6 +1112,6 @@ SHA1-Digest: dF/ofp5XH78/7EMNtvMeTCzpjDU=
Name: webextension/rules/default.rulesets
Digest-Algorithms: MD5 SHA1
-MD5-Digest: Oor89xgZbeiywyee6vcoOA==
-SHA1-Digest: ge9xehKSqTT94h9vl+PpzY0eVdw=
+MD5-Digest: QhRoehlsAIxMGH0ffwa+Gw==
+SHA1-Digest: TKwIPPl5Av/CAkZHkebC0/BV+OM=
diff --git a/src/META-INF/mozilla.rsa b/src/META-INF/mozilla.rsa
index 980aa2f5ff07..3c9178ca1262 100644
Binary files a/src/META-INF/mozilla.rsa and b/src/META-INF/mozilla.rsa differ
diff --git a/src/META-INF/mozilla.sf b/src/META-INF/mozilla.sf
index 74846f739501..d0bd0044555f 100644
--- a/src/META-INF/mozilla.sf
+++ b/src/META-INF/mozilla.sf
@@ -1,4 +1,4 @@
Signature-Version: 1.0
-MD5-Digest-Manifest: AmowU2amjwbQ8MPSFvByQw==
-SHA1-Digest-Manifest: B5FO/ru57cRnJ5zKgmK7cLHrZig=
+MD5-Digest-Manifest: OSWjHPcB61ocUoseHFeeFg==
+SHA1-Digest-Manifest: ccND8/gzJVpI1Gqa+tUPDSAkGDY=
diff --git a/src/install.rdf b/src/install.rdf
index 8f8a523ac034..60e5a60ec54e 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -9,7 +9,7 @@
2
true
Encrypt the Web! Automatically use HTTPS security on many sites.
- 2017.8.17
+ 2017.8.19
true
https://www.eff.org/https-everywhere
chrome://https-everywhere/skin/icon-active-48.png
diff --git a/utils/duplicate-whitelist.txt b/utils/duplicate-whitelist.txt
index 6eb64cd9c521..fb3501e8220a 100644
--- a/utils/duplicate-whitelist.txt
+++ b/utils/duplicate-whitelist.txt
@@ -56,8 +56,6 @@ ieeexplore.ieee.org
inc.com
inductionsolutions.com
infinet.com.au
-ionicframework.com
-www.ionicframework.com
ivegotkids.com
ideas.joomla.org
jrrt.org.uk
diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv
index cfe22e7eea9b..f1c36fccb3cb 100644
--- a/utils/ruleset-whitelist.csv
+++ b/utils/ruleset-whitelist.csv
@@ -863,7 +863,6 @@ f96207dbef9f186192e42047c313a1e3926c8f0262c4d5da9984526ff225d598,1,1,Desire2lear
f7ac41f01652f32d4053e7a4b47997e97f8f1aa08c12a01dd72f27276a476fc2,1,1,Desura.xml
8e0c8d279c34bcd0e90d9c35f1bf31b7f1df755020ffa9341f6155a57fbe59ca,1,1,Details.xml
97be3b5188364d96f05fa5c7aec1494f7d0ebac7e9639d8c09cdeb9dbf3b566a,1,1,Deutscher_Bundestag.xml
-7c60a0cdab8f58737d6490579b4eacfc0b581dfd7df78396f3bb66fb91f9d148,1,1,Deviantart-mismatches.xml
86a1f9c349c7266714c5d4a26bf9e6674443fae524e040bad4cdf0951f73a988,1,1,DevsBuild.It.xml
fe8912569f087a1973bb0d9035dc00ab630eefed150c06a51cd6756243af917e,1,1,DevZing.com.xml
5a3b022a658985b87a1a497348ecdca4dc3c29499681e1371f2793b0ab58bafa,1,1,DFiles.eu.xml