Merge branch 'master' into 3.4-working

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

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

diff --cc openbox/config.c
Simple merge

diff --cc openbox/frame.c
Simple merge