Merge branch 'backport' into 3.4-working

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

diff --cc openbox/client.c
Simple merge

diff --cc openbox/client.h
Simple merge

diff --cc openbox/frame.c
Simple merge