Merge branch 'next' into master

diff --cc debian/changelog
index 76fe1577b16a58b353cbb69c35016fe5a2fd5a6a,7695bb4c2ed75b5b3464e4f23e42a16b437c93d6..35b3f9f6d50f3908e96844dc715a114ee6cf0407
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,9 +1,9 @@@
 -  * UNRELEASED
+ i3-wm (4.15.1-1) unstable; urgency=medium
+ 
++  * New upstream release.
+ 
+  -- Michael Stapelberg <stapelberg@debian.org>  Sat, 10 Mar 2018 17:27:26 +0100
+ 
  i3-wm (4.15-1) unstable; urgency=medium
  
    * New upstream release.