Merge branch 'debpsuedomerge' into jessie-working

diff --cc debian/changelog
index bf198d1028ba8135e1dd07a92f263a2bef2f3876,602a096b0fb8bb7c438971fc6d750e526c6bd042..bb4eb2d0726a2995b9fa0bbb5ca00048fbcbd461
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
 +partman-ext3 (84+rpi1) jessie-staging; urgency=medium
 +  [changes brought forward from 82+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 23 Mar 2014 13:52:02 +0000]
 +  * Remove ext4-modules dependency as raspbian kernels have it built-in.
 +
 + -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Jun 2015 23:24:28 +0000
 +
+ partman-ext3 (84+deb8u1) jessie; urgency=low
+ 
+   [ Christian Perrier ]
+   * Force ext3|ext4 filesystem creation with "-F" so that D-I doesn't
+     "hang" when re-using an existing partition in some situations.
+     Closes: #767682
+ 
+  -- Cyril Brulebois <kibi@debian.org>  Thu, 13 Jul 2017 17:36:02 +0200
+ 
  partman-ext3 (84) unstable; urgency=low
  
    [ Updated translations ]
@@@ -1573,6 -1576,6 +1582,3 @@@ partman-ext3 (1) unstable; urgency=lo
  
   -- Anton Zinoviev <zinoviev@debian.org>  Wed, 10 Dec 2003 10:25:33 +0200
  
--Local Variables:
--coding: utf-8
--End: