Merge branch 'master' into next

Conflicts:
	src/handlers.c

diff --cc include/data.h
Simple merge

diff --cc src/handlers.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/x.c
Simple merge