Merge branch 'master' into windows

diff --cc libs/midi++2/ipmidi_port.cc
Simple merge

diff --cc libs/midi++2/midi++/port.h
index a915320fa366bc3c6ea199cb9a465e23e95bb949,f16743337c8c7e626b7604929c5a578e94ccdf46..daa2fa2db4961e053df9969dd9ea19d8b7eddb1e
--- 1/libs/midi++2/midi++/port.h
--- 2/libs/midi++2/midi++/port.h
+++ b/libs/midi++2/midi++/port.h
@@@ -22,14 -22,12 +22,16 @@@
  #include <string>
  #include <iostream>
  
- #include <jack/types.h>
+ #include <jack/types.h> /* XXX ... desirable to get rid of this but needed for
+                        * now due to use of JackPortIsXXXX
+                        */
  
 +#include <pthread.h>
 +
  #include "pbd/xml++.h"
 +#ifndef PLATFORM_WINDOWS
  #include "pbd/crossthread.h"
 +#endif
  #include "pbd/signals.h"
  #include "pbd/ringbuffer.h"