Merge branch 'backport' into 3.4-working

Conflicts:

	openbox/screen.h

diff --cc data/rc.xml
Simple merge

diff --cc openbox/client.c
Simple merge

diff --cc openbox/config.c
Simple merge

diff --cc openbox/config.h
Simple merge

diff --cc openbox/screen.h
Simple merge