Merge branch 'master' into next

Conflicts:
	testcases/t/159-socketpaths.t

diff --cc docs/ipc
Simple merge

diff --cc docs/userguide
Simple merge

diff --cc man/i3.man
Simple merge

diff --cc src/util.c
Simple merge

diff --cc testcases/t/159-socketpaths.t
index 30460fa94569332c3395f6fc3c5d01db41b137d5,b9cc9b631e1549d25f9c8eb31b99f6903ad6ac37..cc54d5a980f7581bf8c2dbbaed39b1e4ecc50e0d
--- 1/testcases/t/159-socketpaths.t
--- 2/testcases/t/159-socketpaths.t
+++ b/testcases/t/159-socketpaths.t
@@@ -19,9 -20,20 +19,20 @@@ EO
  
  # ensure XDG_RUNTIME_DIR is not set
  delete $ENV{XDG_RUNTIME_DIR};
 -my $pid = launch_with_config($config, 1);
+ 
+ # See which files exist in /tmp before to not mistakenly check an already
+ # existing tmpdir of another i3 instance.
+ my @files_before = </tmp/i3-*>;
 +my $pid = launch_with_config($config, dont_add_socket_path => 1);
+ my @files_after = </tmp/i3-*>;
+ @files_after = grep { !($_ ~~ @files_before) } @files_after;
+ 
+ is(@files_after, 1, 'one new temp directory');
  
  my $folder = "/tmp/i3-" . getpwuid(getuid());
+ like($files_after[0], qr/^$folder/, 'temp directory matches expected pattern');
+ $folder = $files_after[0];
+ 
  ok(-d $folder, "folder $folder exists");
  my $socketpath = "$folder/ipc-socket." . $pid;
  ok(-S $socketpath, "file $socketpath exists and is a socket");