Merge branch 'backport' into 3.4-working

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

diff --cc openbox/config.c
Simple merge

diff --cc openbox/mouse.c
Simple merge

diff --cc openbox/openbox.c
Simple merge

diff --cc openbox/session.c
Simple merge