update from upstream branch next

Merge branch 'next' of git://code.i3wm.org/i3 into next

Conflicts:
	src/manage.c