Merge version 2.18.4-1+rpi1 and 2.18.5-1 to produce 2.18.5-1+rpi1

diff --cc debian/changelog
index 4e792ab1ba9329009f675621d247a252e9652f40,c45310615ac04867f87d1db6dcff43d3deaf64d2..b9ea1de8b0c26ff7ca11cee1b15ff45e2c0afe42
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,18 @@@
- webkit2gtk (2.18.4-1+rpi1) buster-staging; urgency=medium
++webkit2gtk (2.18.5-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 25 Jan 2015 02:14:50 +0000]
 +  * Disable javascript JIT as it doesn't appear to be armv6 compatible
 +    (at least I assume that is the cause of the assembler errors)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Dec 2017 15:27:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Jan 2018 00:04:41 +0000
++
+ webkit2gtk (2.18.5-1) unstable; urgency=high
+ 
+   * New upstream release.
+     + This includes fixes to mitigate the effects of the Spectre
+       vulnerability (CVE-2017-5753 and CVE-2017-5715).
+ 
+  -- Alberto Garcia <berto@igalia.com>  Wed, 10 Jan 2018 14:23:33 +0200
  
  webkit2gtk (2.18.4-1) unstable; urgency=high