Merge branch 'next' into master

diff --cc debian/changelog
index dae55d7e8bdf2eb6b0407f03223da9b4ea956844,3778e1c91070d5a122c55331fb0fabb2e916b2fb..8dd823ebb37577973eca30a4d7f0ada9e6e14964
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,15 +1,15 @@@
 -  * UNRELEASED
+ i3-wm (4.14.2-1) unstable; urgency=medium
+ 
++  * New upstream release.
+ 
+  -- Michael Stapelberg <stapelberg@debian.org>  Mon, 25 Sep 2017 08:55:22 +0200
+ 
+ i3-wm (4.14.1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Michael Stapelberg <stapelberg@debian.org>  Sun, 24 Sep 2017 19:21:15 +0200
+ 
  i3-wm (4.14-1) unstable; urgency=medium
  
    * New upstream release.

diff --cc src/con.c
index fcde4c100c750bbcece6e7c3a9ddec398eb3c704,985d07da2dd8e58058fe7e0bea207f62ab7ac572..4d0c43e3562133e59920bf359b177fca974e90c3
--- 1/src/con.c
--- 2/src/con.c
+++ b/src/con.c
@@@ -243,15 -243,29 +243,36 @@@ void con_focus(Con *con) 
          workspace_update_urgent_flag(con_get_workspace(con));
          ipc_send_window_event("urgent", con);
      }
 +
 +    /* Focusing a container with a floating parent should raise it to the top. Since
 +     * con_focus is called recursively for each parent we don't need to use
 +     * con_inside_floating(). */
 +    if (con->type == CT_FLOATING_CON) {
 +        floating_raise_con(con);
 +    }
  }
  
+ /*
+  * Raise container to the top if it is floating or inside some floating
+  * container.
+  *
+  */
+ static void con_raise(Con *con) {
+     Con *floating = con_inside_floating(con);
+     if (floating) {
+         floating_raise_con(floating);
+     }
+ }
+ 
+ /*
+  * Sets input focus to the given container and raises it to the top.
+  *
+  */
+ void con_activate(Con *con) {
+     con_focus(con);
+     con_raise(con);
+ }
+ 
  /*
   * Closes the given container.
   *