Merge branch 'master' into next

diff --combined src/util.c
index db2f0204d24a0ddb83a166c28fae1737ed0589bf,8273e0cf0150cda981d42af87b3f1171e336f10b..e623ce81b822e0121d2641665145b2da2402f05d
--- 1/src/util.c
--- 2/src/util.c
+++ b/src/util.c
@@@ -1,5 -1,3 +1,5 @@@
 +#undef I3__FILE__
 +#define I3__FILE__ "util.c"
  /*
   * vim:ts=4:sw=4:expandtab
   *
@@@ -93,7 -91,7 +93,7 @@@ void exec_i3_utility(char *name, char *
      char buffer[BUFSIZ];
      if (readlink("/proc/self/exe", buffer, BUFSIZ) == -1) {
          warn("could not read /proc/self/exe");
-         exit(1);
+         _exit(1);
      }
      dir = dirname(buffer);
      sasprintf(&migratepath, "%s/%s", dir, name);
@@@ -102,7 -100,7 +102,7 @@@
  #endif
  
      warn("Could not start %s", name);
-     exit(2);
+     _exit(2);
  }
  
  /*
@@@ -305,7 -303,6 +305,7 @@@ void i3_restart(bool forget_layout) 
      char *restart_filename = forget_layout ? NULL : store_restart_layout();
  
      kill_configerror_nagbar(true);
 +    kill_commanderror_nagbar(true);
  
      restore_geometry();