Merge version 2.31.1-4+rpi1 and 2.31.1-5 to produce 2.31.1-5+rpi1

diff --cc debian/changelog
index 4baebd2641494204375a92dc9d3a5128853c84aa,638349625fe293d37529f46d83c7b51bcfe9684e..c1bfb311f9d764a8a917902b1828fdc87e3d6eda
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- binutils (2.31.1-4+rpi1) buster-staging; urgency=medium
++binutils (2.31.1-5+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.29-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 15:41:49 +0000]
 +  * Disable testsuite, it fails on our lxc based autobuilders.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 22 Aug 2018 15:51:33 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 03 Sep 2018 00:22:01 +0000
++
+ binutils (2.31.1-5) unstable; urgency=medium
+ 
+   * Fix the "build" autopkg test, depending on fakeroot and allowing output
+     on stderr.
+ 
+  -- Matthias Klose <doko@debian.org>  Fri, 31 Aug 2018 11:56:41 +0200
  
  binutils (2.31.1-4) unstable; urgency=medium