Merge branch 'master' into debian-jessie-backports

diff --combined debian/changelog
index dc405232d28932194ebfc4ada1c2979f9a81358f,81a67928286d046a57efc3943d00a10e0f4f6f23..29189e25ba75d794ec764363f24ea668154af8a3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,28 +1,36 @@@
+ ikiwiki (3.20160509) unstable; urgency=high
+ 
+   [ Amitai Schlair ]
+   * img: ignore the case of the extension when detecting image format,
+     fixing the regression that *.JPG etc. would not be displayed
+     since 3.20160506
+ 
+   [ Simon McVittie ]
+   * img: parse img_allowed_formats case-insensitively, as was done in
+     3.20141016.3
+   * inline: restore backwards compat for show=-1 syntax, which
+     worked before 3.20160121
+   * Remove a spurious changelog entry from 3.20160506 (the relevant
+     change was already in 3.20150614)
+   * Add CVE-2016-4561 reference to 3.20160506 changelog
+   * Set high urgency to get the CVE-2016-4561 fix and CVE-2016-3714
+     mitigation into testing
+ 
+  -- Simon McVittie <smcv@debian.org>  Mon, 09 May 2016 21:57:09 +0100
+ 
 +ikiwiki (3.20160506~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports
 +  * debian/tests/control: set INSTALLED_TESTS=1 here, pkg-perl-autopkgtest
 +    in jessie didn't support debian/tests/pkg-perl/smoke-env
 +
 + -- Simon McVittie <smcv@debian.org>  Fri, 06 May 2016 08:58:18 +0100
 +
  ikiwiki (3.20160506) unstable; urgency=medium
  
    [ Simon McVittie ]
-   * img: stop ImageMagick trying to be clever if filenames contain a colon,
-     avoiding mis-processing
    * HTML-escape error messages, in one case avoiding potential cross-site
-     scripting (OVE-20160505-0012)
+     scripting (CVE-2016-4561, OVE-20160505-0012)
    * Mitigate ImageMagick vulnerabilities such as CVE-2016-3714:
      - img: force common Web formats to be interpreted according to extension,
        so that "allowed_attachments: '*.jpg'" does what one might expect
@@@ -43,12 -53,6 +61,12 @@@
  
   -- Simon McVittie <smcv@debian.org>  Fri, 06 May 2016 07:54:26 +0100
  
 +ikiwiki (3.20160121~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Simon McVittie <smcv@debian.org>  Thu, 21 Jan 2016 10:18:07 +0000
 +
  ikiwiki (3.20160121) unstable; urgency=medium
  
    [ Amitai Schlair ]
@@@ -100,12 -104,6 +118,12 @@@
  
   -- Simon McVittie <smcv@debian.org>  Thu, 21 Jan 2016 09:53:07 +0000
  
 +ikiwiki (3.20150614~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports, no source changes (Closes: #807452)
 +
 + -- Simon McVittie <smcv@debian.org>  Mon, 18 Jan 2016 07:03:11 +0000
 +
  ikiwiki (3.20150614) unstable; urgency=medium
  
    * inline: change default sort order from age to "age title" for