Merge branch 'backport' into 3.4

diff --cc openbox/actions/cyclewindows.c
Simple merge

diff --cc openbox/actions/desktop.c
Simple merge

diff --cc openbox/actions/directionalwindows.c
Simple merge

diff --cc openbox/client.h
Simple merge

diff --cc openbox/config.h
Simple merge

diff --cc openbox/frame.c
Simple merge

diff --cc openbox/openbox.c
Simple merge

diff --cc openbox/session.c
Simple merge