Merge branch 'master' into fix-monitor

doc/zmq_msg_get.txt

@@ -25,8 +25,9 @@ Indicates that there are more message frames to follow after the 'message'.
 
 RETURN VALUE
 ------------
-The _zmq_msg_get()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
+The _zmq_msg_get()_ function shall return the value for the property if
+successful. Otherwise it shall return `-1` and set 'errno' to one of the
+values defined below.
 
 
 ERRORS

tests/test_connect_delay.cpp

@@ -24,6 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include <string.h>
 #include <unistd.h>
 #include <string>
+#include <pthread.h>
 
 #undef NDEBUG
 #include <assert.h>