Merge branch 'master' into next

diff --cc include/ipc.h
index 24014c2f2b3f1066564deb649fa26a09ffe48a84,dfb12b9bc3cab1246f8717c9aff31f2244e86d19..cbbec8e401a9dd888f7cb66a5425158c51b53921
--- 1/include/ipc.h
--- 2/include/ipc.h
+++ b/include/ipc.h
@@@ -80,3 -81,12 +80,10 @@@ void ipc_send_event(const char *event, 
  void ipc_shutdown(void);
  
  void dump_node(yajl_gen gen, Con *con, bool inplace_restart);
 -
 -#endif
+ 
+ /**
+  * For the workspace "focus" event we send, along the usual "change" field,
+  * also the current and previous workspace, in "current" and "old"
+  * respectively.
+  */
+ void ipc_send_workspace_focus_event(Con *current, Con *old);

diff --cc src/ipc.c
Simple merge

diff --cc src/move.c
Simple merge