Merge branch 'master' of https://github.com/zeromq/libzmq
Thread scheduling parameters: Use ZMQ context options instead of
environment variables.
Merge pull request #1117 from jlauenercern/master

Thread scheduling parameters: Use ZMQ context options instead of environment variables.
Add static compilation on CMake
Merge pull request #1118 from guidefloripa/master

Add static compilation on CMake
Fix to build on OpenBSD
Merge remote-tracking branch 'upstream/master'
duplicated type definitions when using CMAKE
Merge pull request #1119 from mosconi/master

Fix to build on OpenBSD
Don't delay reception of signal

- new code may help undersdtand issue #1108
  (https://github.com/zeromq/libzmq/issues/1108)
- code cleanups
Merge pull request #1120 from hurtonm/master

Don't delay reception of signal
vs2012: Add missing socks files
Merge pull request #1121 from twhittock/master

vs2012: Add missing socks files
Windows: if WSA error number is held, use directly.
It must be done this way, as WSAGetLastError returns 0 in these circumstances
Merge pull request #1122 from twhittock/win-errhandle

Windows: if WSA error number is held, use directly.
Resolve issue #949
Merge pull request #1123 from hurtonm/master

Resolve issue #949
Merge branch 'master' of https://github.com/zeromq/libzmq
Add test for unbinding inproc socket.
Merge pull request #1124 from ricnewton/master

Add test for unbinding inproc socket.