Merge branch 'next' into master

diff --cc debian/changelog
index bfbc8382f9ac7de80c59f26e6e43a49ec310a12d,3c88a21e98b94c51c718637225ed5e990bc4086a..80e2d5ec7be112fa459d6eb4c4fb8b63c353488e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,17 +1,20 @@@
 -  * UNRELEASED
+ i3-wm (4.12.1-1) unstable; urgency=medium
+ 
++  * New upstream release.
++  * Move to debhelper 9
++  * Bump Standards-Version to 3.9.7 (no changes necessary)
++  * debian/watch: verify signature, use https
+ 
+  -- Michael Stapelberg <stapelberg@debian.org>  Fri, 01 Apr 2016 16:34:35 +0200
+ 
+ i3-wm (4.12-2) unstable; urgency=medium
+ 
+   * Override lintian warning desktop-entry-contains-unknown-key for
+     DesktopNames, gdm needs that key.
+   * Remove i3-wm.menu to conform to the tech-ctte decision on #741573.
+ 
+  -- Michael Stapelberg <stapelberg@debian.org>  Fri, 01 Apr 2016 15:51:23 +0200
+ 
  i3-wm (4.12-1) unstable; urgency=medium
  
    * New upstream release.