Merge branch 'master' into next

diff --cc src/cmdparse.y
Simple merge

diff --cc src/floating.c
Simple merge

diff --cc src/handlers.c
Simple merge

diff --cc src/randr.c
Simple merge

diff --cc src/tree.c
Simple merge

diff --cc src/workspace.c
Simple merge