Merge branch 'backport' into 3.4-working

Conflicts:

	openbox/actions/focus.c

diff --cc openbox/actions/focus.c
index a157b4a,8da8ed5..5c86808
--- 1/openbox/actions/focus.c
--- 2/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@@ -72,8 -57,7 +73,8 @@@ static gboolean run_func(ObActionsData 
               data->context != OB_FRAME_CONTEXT_FRAME))
          {
              actions_client_move(data, TRUE);
-             client_activate(data->client, o->here,
 -            client_activate(data->client, TRUE, o->here, FALSE, FALSE, TRUE);
++            client_activate(data->client, TRUE, o->here,
 +                            o->activate, o->activate, TRUE);
              actions_client_move(data, FALSE);
          }
      } else if (data->context == OB_FRAME_CONTEXT_DESKTOP) {

diff --cc openbox/client.c
Simple merge

diff --cc openbox/client.h
Simple merge

diff --cc openbox/config.c
Simple merge

diff --cc openbox/focus.h
Simple merge

diff --cc openbox/frame.c
Simple merge