Merge branch 'master' into windows

diff --combined libs/midi++2/midi++/ipmidi_port.h
index a4adb14cf4bb67f3afe6d41eecfd348dadcc00e1,8d5cecdf11b23d126a2fe0fc5daeb18394f96583..41a462883ed8510b7119e15132c86a1cdd0b03f8
--- 1/libs/midi++2/midi++/ipmidi_port.h
--- 2/libs/midi++2/midi++/ipmidi_port.h
+++ b/libs/midi++2/midi++/ipmidi_port.h
@@@ -21,7 -21,7 +21,7 @@@
  
  #include <string>
  #include <iostream>
 -#if defined(WIN32)
 +#if defined(PLATFORM_WINDOWS)
  #include <winsock.h>
  #elif defined(__FREE_BSD__)
  #include <netinet/in.h>
@@@ -41,8 -41,6 +41,6 @@@
  
  #include <glibmm/threads.h>
  
- #include <jack/types.h>
- 
  #include "pbd/xml++.h"
  #include "pbd/crossthread.h"
  #include "pbd/signals.h"