Merge remote-tracking branch 'upstream/work' into growtofill_option

Conflicts:
	openbox/actions/growtoedge.c
Fixed problem during merge.
Merge branch 'growtofill_option' of https://github.com/deters/openbox-1 into growtofill_option