Merge branch 'backport' into work

Conflicts:
	openbox/config.c

diff --cc data/rc.xml
Simple merge

diff --cc openbox/config.c
index 790b03b,96fdd0f..e3be728
--- 1/openbox/config.c
--- 2/openbox/config.c
+++ b/openbox/config.c
@@@ -264,7 -268,7 +265,7 @@@ static void parse_per_app_settings(xmlN
                          if (!g_ascii_strcasecmp(s, "mouse"))
                              settings->monitor = 0;
                          else
-                             settings->monitor = obt_parse_node_int(c) + 1;
 -                            settings->monitor = parse_int(doc, c);
++                            settings->monitor = obt_parse_node_int(c);
                          g_free(s);
                      }