Merge branch 'master' into next

diff --cc src/manage.c
index 202b0649fd68bbcb68f9b1b10f4f62cdf56db7d2,9eee35786d2c5b01c0e780577f5a7ebc4758c84c..61ca0409eeb3a67d196d3b2dd5ad554847e8f338
--- 1/src/manage.c
--- 2/src/manage.c
+++ b/src/manage.c
@@@ -505,7 -505,7 +505,7 @@@ void manage_window(xcb_window_t window
  
      /* Defer setting focus after the 'new' event has been sent to ensure the
       * proper window event sequence. */
-     if (set_focus && !nc->window->doesnt_accept_focus) {
 -    if (set_focus && nc->mapped) {
++    if (set_focus && !nc->window->doesnt_accept_focus && nc->mapped) {
          DLOG("Now setting focus.\n");
          con_focus(nc);
      }