Merge branch 'master' into next

Conflicts:
	testcases/t/005-floating.t

diff --cc testcases/t/005-floating.t
index 9ac45627aa39446f057a0e422f75b8c96eae2c2c,688de40a5634a5e0d8250ea44715e985d8d5a4dd..db5fb6db5ed564bf27a35c731724af7a32220134
--- 1/testcases/t/005-floating.t
--- 2/testcases/t/005-floating.t
+++ b/testcases/t/005-floating.t
@@@ -18,7 -36,13 +18,7 @@@ ok($absolute->{x} != 0 && $absolute->{y
  
  $window->unmap;
  
- $window = open_floating_window(rect => [ 1, 1, 80, 90 ]);
 -$window = $x->root->create_child(
 -    class => WINDOW_CLASS_INPUT_OUTPUT,
 -    rect => [ 20, 20, 80, 90],
 -    background_color => '#C0C0C0',
 -    window_type => $x->atom(name => '_NET_WM_WINDOW_TYPE_UTILITY'),
 -    event_mask => [ 'structure_notify' ],
 -);
++$window = open_floating_window(rect => [ 20, 20, 80, 90 ]);
  
  isa_ok($window, 'X11::XCB::Window');