Merge commit '91f009a' into bfgminer-3.5.x

Conflicts:
	driver-proxy.c

driver-proxy.c

@@ -9,6 +9,8 @@
 
 #include "config.h"
 
+#include <unistd.h>
+
 #include <pthread.h>
 
 #include <uthash.h>