Merge branch 'debpsuedomerge' into stretch-working

diff --cc debian/changelog
index 1df7d8f9f413d1104dd6e7913806ec28fa1cf9c6,7493af2d12ac399c7ade5b8077af843fe906116a..a85ebf3d8d3d2db6867c2c07c066abf7f090e383
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,9 +1,18 @@@
 +base-files (9.9+rpi1) stretch-staging; urgency=medium
 +
 +  [changes brought forward from 8+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 07 Jan 2015 02:03:42 +0000]
 +  * Modify default vendor etc for raspbian.
 +  * Modify maintainer scripts so default will be set to raspbian even when
 +    upgrading
 +
 + -- Raspbian forward porter <root@raspbian.org>  Wed, 26 Apr 2017 13:26:56 +0000
 +
+ base-files (9.9+deb9u1) stable; urgency=low
+ 
+   * Change /etc/debian_version to 9.1, for Debian 9.1 point release.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Thu, 13 Jul 2017 15:04:04 +0200
+ 
  base-files (9.9) unstable; urgency=medium
  
    * Add MPL-1.1 and MPL-2.0 to common-licenses. Closes: #849835.