Merge branch 'debpsuedomerge' into buster-working

diff --cc debian/changelog
index 29a648ddb70ba2137ef969430f6ad890677ee3ae,0ca7447967b62f61eecd06bd18167887720eeb1b..c8645a388ca7f2c3f8fd1ee9d89f85cf66f867de
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,11 +1,15 @@@
+ bcftools (1.4.1-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Incorporate patches from Ubuntu to fix FTBFS on some 32-bit archs.
+   * Fix autopkgtests by ensuring presence of all deps.
+ 
+  -- Sascha Steinbiss <satta@debian.org>  Sat, 29 Jul 2017 10:38:27 +0200
+ 
 +bcftools (1.4.1-2+rpi1) buster-staging; urgency=medium
 +
 + -- Raspbian forward porter <root@raspbian.org>  Sat, 29 Jul 2017 18:22:05 +0000
 +
  bcftools (1.4.1-2) unstable; urgency=medium
  
    * Team upload