Merge branch 'master' of github.com:zeromq/libzmq

# Conflicts: # builds/msvc/vs2012/libsodium.import.props
2024-12-12 10:33:52 +01:00 · 2016-10-10 11:02:32 +02:00 · 2016-10-10 11:02:32 +02:00 · 3996d4e20d
commit 3996d4e20d
parent 86714959da c30da71735
512 changed files with 20134 additions and 5843 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,9 @@
 syntax: glob # for hg-git users
-Makefile
+/Makefile
+builds/Makefile
+builds/msvc/Makefile
+configure
+doc/Makefile
 Makefile.in
 configure
 libtool
@ -10,6 +14,8 @@ aclocal.m4
 autom4te.cache
 *.o
 *.gcno
+*.gcda
+*.gcov
 *.ncb
 *.lo
 *.loT
@ -18,13 +24,16 @@ autom4te.cache
 *.html
 *.pdf
 *.ps
-.*
 *~
 .*~
+.deps
+.dirstamp
+.libs
 curve_keygen
+test_ancillaries
 test_heartbeats
 test_msg_ffn
-test_socketopt_hwm
+test_sockopt_hwm
 test_resource
 test_ipc_wildcard
 test_stream_empty
@ -114,8 +123,21 @@ test_server_drop_more
 test_thread_safe
 test_thread_safe_polling
 test_getsockopt_memset
+test_setsockopt
 test_stream_exceeds_buffer
 test_poller
+test_timers
+test_radio_dish
+test_udp
+test_scatter_gather
+test_socketopt_hwm
+test_use_fd_ipc
+test_use_fd_tcp
+test_pub_invert_matching
+test_dgram
+test_base85
+test_bind_after_connect_tcp
+test_sodium
 tests/test*.log
 tests/test*.trs
 src/platform.hpp*
@ -126,23 +148,23 @@ remote_lat
 remote_thr
 inproc_lat
 inproc_thr
+!local_lat/
+!local_thr/
+!remote_lat/
+!remote_thr/
+!inproc_lat/
+!inproc_thr/
 doc/*.1
 doc/*.3
 doc/*.7
 doc/*.html
 doc/*.xml
+doxygen/
 src/libzmq.pc
 bin/
 lib/
 obj/
-builds/msvc/**/*.opensdf
-builds/msvc/**/*.suo
-builds/msvc/**/*.sdf
-builds/msvc/**/*.user
-builds/msvc/**/*Debug
-builds/msvc/**/*Release
-builds/redhat/zeromq.spec
-builds/qt-android/prefix/
+builds/android/prefix/
 packaging/nuget/*.nupkg
 foreign/openpgm/*
 !foreign/openpgm/*.tar.bz2
--- a/.mailmap
+++ b/.mailmap
@ -0,0 +1,81 @@
+Ahmet Kakici <ahmet.kakici@pro-line.com.tr> ahmet <ahmet.kakici@pro-line.com.tr>
+Andrey Sibiryov <me@kobology.ru> Kobolog <me@kobology.ru>
+Brian Knox <taotetek@gmail.com> taotetek <taotetek@users.noreply.github.com>
+Chernyshev Vyacheslav <astellar@ro.ru> Astellar <astellar@ro.ru>
+Chris Laws <clawsicus@gmail.com> Chris Laws <claws@localhost>
+Chris Staite <chris@yourdreamnet.co.uk> Chris <chris@yourdreamnet.co.uk>
+Christoph Zach <czach@rst-automation.com> czach <czach@rst-automation.com>
+Chuck Remes <git@chuckremes.com> Chuck Remes <cremes@mac.com>
+Chuck Remes <git@chuckremes.com> Chuck Remes <cremes.devlist@mac.com>
+Constantin Rack <constantin.rack@gmail.com> Constantin Rack <constantin@rack.li>
+Constantin Rack <constantin.rack@gmail.com> Constantin Rack <c-rack@users.noreply.github.com>
+Daniel Krikun <krikun.daniel@gmail.com> danielkr <krikun.daniel@gmail.com>
+Daiyu Hurst <daiyu.hurst@gmail.com> DaiyuHurst <daiyu.hurst@gmail.com>
+Diego Rodriguez-Losada <diego.rlosada@gmail.com> Diego <diego.rlosada@gmail.com>
+Dongmin Yu <miniway@gmail.com> Min(Dongmin Yu) <miniway@gmail.com>
+Doron Somech <somdoron@gmail.com> somdoron <somdoron@gmail.com>
+Elliot Saba <staticfloat@gmail.com> staticfloat <staticfloat@gmail.com>
+Eric Voskuil <eric@voskuil.org> evoskuil <eric@voskuil.org>
+Eric Voskuil <eric@voskuil.org> anonymous <eric@voskuil.org>
+Felipe Farinon <felipe.farinon@powersyslab.com> psl-felipefarinon <felipe.farinon@powersyslab.com>
+Frank Hartmann <soundart@gmx.net> Frank <soundart@gmx.net>
+Gian Lorenzo Meocci <glmeocci@gmail.com> meox <glmeocci@gmail.com>
+Hardeep Singh <hshardeesi@gmail.com> Hardeep <hshardeesi@gmail.com>
+Henrik Feldt <henrik@haf.se> Henrik <henrik@haf.se>
+Huang Xin <chrox.huang@gmail.com> chrox <chrox.huang@gmail.com>
+Ian Barber <ian.barber@gmail.com> Ian Barber <ianbarber@google.com>
+Jens Auer <jens.auer@cgi.com> Jens Auer <jens-auer@users.noreply.github.com>
+Jens Auer <jens.auer@cgi.com> Jens Auer <jens.auer@betaversion.net>
+Joe Eli McIlvain <joe.eli.mac@gmail.com> Joe McIlvain <joe.eli.mac@gmail.com>
+Jos Decoster <jos.decoster@gmail.com> jdc8 <jos.decoster@gmail.com>
+Jos Decoster <jos.decoster@gmail.com> Jos Decoster <jos.decoster@retarget.com>
+Joshua Gao <jmg116@gmail.com> Josh Gao <jgao@mobileiron.com>
+Jörg Kreuzberger <joerg@kreuzberger.eu> kreuzberger <joerg@kreuzberger.eu>
+Arnaud Kapp <kapp.arno@gmail.com> Kapp Arnaud <kapp.arno@gmail.com>
+Arnaud Kapp <kapp.arno@gmail.com> KAPP Arnaud <kapp.arno@gmail.com>
+Arnaud Kapp <kapp.arno@gmail.com> KAPP Arnaud <xaqq@users.noreply.github.com>
+Kenneth Wilke <kenneth.wilke@rackspace.com> KennethWilke <kenneth.wilke@rackspace.com>
+Kevin Sapper <mail@kevinsapper.de> sappo <mail@kevinsapper.de>
+Kevin Sapper <mail@kevinsapper.de> Kevin Sapper <sappo@users.noreply.github.com>
+Leonard Michelet <leonard.michelet@openwide.fr> leonarf <leonard.michelet@openwide.fr>
+Martijn Jasperse <m.jasperse@gmail.com> mjasperse <m.jasperse@gmail.com>
+Martin Hurton <hurtonm@gmail.com> Martin Hurtoň <hurtonm@gmail.com>
+Martin Lucina <martin@lucina.net> Martin Lucina <mato@kotelna.sk>
+Martin Sustrik <sustrik@250bpm.com> Martin Sustrik <sustrik@fastmq.commkdir>
+Martin Sustrik <sustrik@250bpm.com> Martin Sustrik <sustrik@fastmq.com>
+Martin Sustrik <sustrik@250bpm.com> sustrik <sustrik@250bpm.com>
+Martin Sustrik <sustrik@250bpm.com> Martin Sustrik <sustrik@jozsi.(none)>
+Martin Sustrik <sustrik@250bpm.com> unknown <sustrik@.(none)>
+Martin Sustrik <sustrik@250bpm.com> Martin Sustrik <sustrik@turist.(none)>
+Maurice Barnum <msb@yahoo-inc.com> maurice barnum <msb@yahoo-inc.com>
+Maurizio Melato <maurizio.melato@nice-software.com> unknown <mauri@okinawa.(none)>
+Max Skaller <Max.Skaller@gmail.com> skaller <Max.Skaller@gmail.com>
+Michael Fox <415fox@gmail.com> m <415fox@gmail.com>
+Michael Hand <mipa@matrix.by> Mipa <mipa@matrix.by>
+Michel Zou <xantares10@hotmail.com> xantares <xantares09@hotmail.com>
+Mikael Helbo Kjaer <mhk@designtech.dk> Mikael Helbo Kjær <mhk@designtech.dk>
+Mike Gatny <mgatny@gmail.com> Mike Gatny <mgatny@connamara.com>
+Mikko Koppanen <mikko.koppanen@gmail.com> Mikko Koppanen <mkoppanen@php.net>
+Mikko Koppanen <mikko.koppanen@gmail.com> Mikko Koppanen <mikko@kuut.io>
+Mikko Koppanen <mikko.koppanen@gmail.com> Mikko Koppanen <mkoppanen@gameboy.config>
+Min RK <benjaminrk@gmail.com> MinRK <benjaminrk@gmail.com>
+Min RK <benjaminrk@gmail.com> Min Ragan-Kelley <benjaminrk@gmail.com>
+Montoya Edu <montoya.edu@gmail.com> montoyaedu <montoya.edu@gmail.com>
+Nikita Kozlov <nikita@elyzion.net> nikita kozlov <nikita@elyzion.net>
+Pavol Malosek <malosek@fastmq.com> malosek <malosek@fastmq.com>
+Pieter Hintjens <ph@imatix.com> Pieter Hintjens <ph@itmatix.com>
+Reza Ebrahimi <reza.ebrahimi.dev@gmail.com> reza.ebrahimi <reza.ebrahimi.dev@gmail.com>
+Ricardo Catalinas Jiménez <r@untroubled.be> Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
+Rohan Bedarkar <rohanb@cs.uchicago.edu> rohanbedarkar <rohanb@cs.uchicago.edu>
+Rohan Bedarkar <rohanb@cs.uchicago.edu> Rohan <rbe@ws5-34-chi.rtsgroup.net>
+Sergey KHripchenko <shripchenko@intermedia.net> root <root@ast-pbx-mt-3.intermedia.net>
+Sergey KHripchenko <shripchenko@intermedia.net> shripchenko <shripchenko@intermedia.net>
+Sergey M. <dstftw@gmail.com> Sergey M․ <dstftw@gmail.com>
+Steven McCoy <steven.mccoy@miru.hk> Steve-o <fnjordy@gmail.com>
+Tamara Kustarova <kustarova@fastmq.com> tamara <tamara@jozsi.(none)>
+Timothee Besset <ttimo@ttimo.net> Timothee "TTimo" Besset <ttimo@ttimo.net>
+Timothy Mossbarger <tim@ent.net> Tim M <tim@ent.net>
+Trevor Bernard <trevor.bernard@gmail.com> Trevor Bernard <tbernard@liveops.com>
+Trevor Bernard <trevor.bernard@gmail.com> Trevor Bernard <trevor.bernard@userevents.com>
+Volodymyr Korniichuk <VolodymyrKorn@gmail.com> Volodymyr Korniichuk <9173519@gmail.com>
+lysyloren <lysy_loren@gmail.com> lysyloren <lysy.loren@gmail.com>
--- a/.travis.yml
+++ b/.travis.yml
@ -6,20 +6,64 @@ os:
 - linux
 - osx

-env:
- BUILD_TYPE=default
- BUILD_TYPE=qt-android
+dist: trusty

-sudo: false
+env:
+- BUILD_TYPE=default CURVE=tweetnacl DRAFT=enabled
+- BUILD_TYPE=android CURVE=tweetnacl
+- BUILD_TYPE=cmake CURVE=tweetnacl
+- BUILD_TYPE=default CURVE=libsodium
+- BUILD_TYPE=default
+- BUILD_TYPE=coverage CURVE=tweetnacl DRAFT=enabled
+- BUILD_TYPE=valgrind CURVE=tweetnacl DRAFT=enabled
+
+matrix:
+  exclude:
+  - env: BUILD_TYPE=coverage CURVE=tweetnacl DRAFT=enabled
+    os: osx
+  - env: BUILD_TYPE=valgrind CURVE=tweetnacl DRAFT=enabled
+    os: osx
+  include:
+  - env: BUILD_TYPE=default CURVE=tweetnacl IPv6=ON
+    os: linux
+    dist: precise
+    sudo: false
+
+sudo: required
+
+addons:
+  apt:
+    packages:
+    - cmake
+    - lcov
+    - valgrind

 before_install:
 - if [ $TRAVIS_OS_NAME == "osx" ] ; then brew update; brew install binutils ; fi
+# workaround for Travis OSX CI bug, hasn't been fixed in a month so time for a hack
+- if [ $TRAVIS_OS_NAME == "osx" ] ; then brew uninstall libtool && brew install libtool ; fi

 before_script:
 # ZMQ stress tests need more open socket (files) than the usual default
 # On OSX, it seems the way to set the max files limit is constantly changing, so
 # try to use all known knobs to ensure compatibility across various versions
- if [ $TRAVIS_OS_NAME == "osx" ] ; then sudo sysctl -w kern.maxfiles=64000 ; sudo sysctl -w kern.maxfilesperproc=64000 ; sudo launchctl limit maxfiles 64000 64000 ; fi ; ulimit -n 64000
+- if [ $TRAVIS_OS_NAME == "osx" ] ; then sudo sysctl -w kern.maxfiles=64000 ; sudo sysctl -w kern.maxfilesperproc=64000 ; sudo launchctl limit maxfiles 64000 64000 ; ulimit -n 64000; fi

 # Build and check this project according to the BUILD_TYPE
 script: ./ci_build.sh
+
+# Deploy tags
+before_deploy:
+- . ./ci_deploy.sh
+deploy:
+  provider: releases
+  api_key:
+    secure: vGB5E+A8wxm2J1GJZzmIgT9PrjEzvd9gE8iui8FyxSbxAsW9vFZFGZC/21sTtpVcmRarwQCHH1UEbtg+nJwN2iD9YzMRnSVks8xqP+b709YW+VXaMuhZgTzWa74IorQku7NuvLibvQk72/OSgdwPGaNJ6f5AX9pnWVWbEoW1svE=
+  file_glob: true
+  file: ${LIBZMQ_DEPLOYMENT}
+  skip_cleanup: true
+  on:
+    repo: zeromq/libzmq
+    branch: master
+    tags: true
+    condition: "$TRAVIS_OS_NAME =~ (linux) && $BUILD_TYPE =~ (default) && $CURVE =~ (libsodium) && -z $DRAFT"
--- a/246
+++ b/246
@ -8,133 +8,141 @@ Copyright (c) 2011 VMware, Inc.
 Copyright (c) 2012 Spotify AB
 Copyright (c) 2013 Ericsson AB
 Copyright (c) 2014 AppDynamics Inc.
+Copyright (c) 2015-2016 Brocade Communications Systems Inc.

 Individual Contributors
 =======================

-AJ Lewis 
-Alexej Lotz 
-Andrew Thompson 
-Asko Kauppi 
-Attila Mark 
-Barak Amar 
-Ben Gray 
-Bernd Prager 
-Bernd Melchers 
-Bob Beaty 
-Brandon Carpenter 
-Brian Buchanan 
-Brett Cameron 
-Burak Arslan 
-Carl Clemens 
-Chia-liang Kao 
-Chris Busbey 
-Chris Rempel 
-Chris Wong 
-Christian Gudrian 
-Christian Kamm 
-Chuck Remes 
-Conrad D. Steenberg 
+AJ Lewis
+Alexej Lotz
+Andrew Thompson
+André Caron
+Asko Kauppi
+Attila Mark
+Barak Amar
+Ben Gray
+Bernd Melchers
+Bernd Prager
+Bob Beaty
+Brandon Carpenter
+Brett Cameron
+Brian Buchanan
+Burak Arslan
+Carl Clemens
+Chia-liang Kao
+Chris Busbey
+Chris Rempel
+Chris Wong
+Christian Gudrian
+Christian Kamm
+Chuck Remes
+Conrad D. Steenberg
 Constantin Rack
-Dhammika Pathirana 
-Dhruva Krishnamurthy 
-Dirk O. Kaar 
-Douglas Creager 
-Drew Crawford 
-Erich Heine 
-Erik Hugne 
-Erik Rigtorp 
-Fabien Ninoles 
-Frank Denis 
-George Neill 
-Gerard Toonstra 
-Ghislain Putois 
-Gonzalo Diethelm 
-Guido Goldstein 
-Ian Barber 
-Ilja Golshtein 
-Ivo Danihelka 
-Jacob Rideout 
-Joe Thornber 
-Jon Dyte 
-Kamil Shakirov 
-Ken Steele 
-Laurent Alebarde 
-Marc Rossi 
-Mark Barbisan 
-Martin Hurton 
-Martin Lucina 
-Martin Pales 
-Martin Sustrik 
-Matus Hamorsky 
-Max Wolf 
-McClain Looney 
-Michael Compton 
-Mika Fischer 
-Mikael Helbo Kjaer 
-Mike Gatny 
-Mikko Koppanen 
-Min Ragan-Kelley 
-Neale Ferguson 
-Nir Soffer 
-Paul Betts 
-Paul Colomiets 
-Pavel Gushcha 
-Pavol Malosek 
-Perry Kundert 
-Peter Bourgon 
-Philip Kovacs 
-Pieter Hintjens 
-Piotr Trojanek 
-Richard Newton 
-Rik van der Heijden
-Robert G. Jakabosky 
-Sebastian Otaegui 
-Stefan Radomski 
-Steven McCoy 
-Stuart Webster 
-Tamara Kustarova 
-Taras Shpot 
-Tero Marttila 
-Terry Wilson 
-Thijs Terlouw 
-Thomas Rodgers 
-Toralf Wittner 
-Tore Halvorsen 
-Trevor Bernard 
-Vitaly Mayatskikh 
-Lourens Naudé 
-Hardeep Singh 
-André Caron 
-Tim Mossbarger 
+Daniel J. Bernstein
+Dhammika Pathirana
+Dhruva Krishnamurthy
+Dirk O. Kaar
 Doron Somech
+Douglas Creager
+Drew Crawford
+Erich Heine
+Erik Hugne
+Erik Rigtorp
+Fabien Ninoles
+Frank Denis
+George Neill
+Gerard Toonstra
+Ghislain Putois
+Gonzalo Diethelm
+Guido Goldstein
+Hardeep Singh
+Hiten Pandya
+Ian Barber
+Ilja Golshtein
+Ilya Kulakov
+Ivo Danihelka
+Jacob Rideout
+Joe Thornber
+Jon Dyte
+Kamil Shakirov
+Ken Steele
+Kouhei Sutou
+Laurent Alebarde
+Leonardo J. Consoni
+Lourens Naudé
+Luca Boccassi
+Marc Rossi
+Mark Barbisan
+Martin Hurton
+Martin Lucina
+Martin Pales
+Martin Sustrik
+Matus Hamorsky
+Max Wolf
+McClain Looney
+Michael Compton
+Mika Fischer
+Mikael Helbo Kjaer
+Mike Gatny
+Mikko Koppanen
+Min Ragan-Kelley
+Neale Ferguson
+Nir Soffer
+Osiris Pedroso
+Paul Betts
+Paul Colomiets
+Pavel Gushcha
+Pavol Malosek
+Perry Kundert
+Peter Bourgon
+Philip Kovacs
+Pieter Hintjens
+Piotr Trojanek
+Richard Newton
+Rik van der Heijden
+Robert G. Jakabosky
+Sebastian Otaegui
+Stefan Radomski
+Steven McCoy
+Stuart Webster
+Tamara Kustarova
+Taras Shpot
+Tero Marttila
+Terry Wilson
+Thijs Terlouw
+Thomas Rodgers
+Tim Mossbarger
+Toralf Wittner
+Tore Halvorsen
+Trevor Bernard
+Vitaly Mayatskikh

 Credits
 =======

-Aamir Mohammad 
-Adrian von Bidder 
-Aleksey Yeschenko 
-Alessio Spadaro 
-Alexander Majorov 
-Anh Vu 
-Bernd Schumacher 
-Brian Granger 
-Carsten Dinkelmann 
-David Bahi 
-Dirk Eddelbuettel 
-Evgueny Khartchenko 
-Frank Vanden Berghen 
-Ian Barber 
-John Apps 
-Markus Fischer 
-Matt Muggeridge 
-Michael Santy 
-Oleg Sevostyanov 
-Paulo Henrique Silva 
-Peter Busser 
-Peter Lemenkov 
-Robert Zhang 
-Toralf Wittner 
-Zed Shaw 
+Aamir Mohammad
+Adrian von Bidder
+Aleksey Yeschenko
+Alessio Spadaro
+Alexander Majorov
+Anh Vu
+Bernd Schumacher
+Brian Granger
+Carsten Dinkelmann
+David Bahi
+Dirk Eddelbuettel
+Evgueny Khartchenko
+Frank Vanden Berghen
+Ian Barber
+John Apps
+Markus Fischer
+Matt Muggeridge
+Michael Santy
+Oleg Sevostyanov
+Paulo Henrique Silva
+Peter Busser
+Peter Lemenkov
+Robert Zhang
+Toralf Wittner
+Zed Shaw

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/Doxygen.cfg
+++ b/Doxygen.cfg
--- a/5
+++ b/5
@ -14,6 +14,11 @@ If you clone the Git repository then you should start by running the
 command `./autogen.sh`. This is not necessary if you get the source
 packages.

+Windows Builds
+==============
+
+For Windows building, see the libzmq\builds\msvc\readme.txt file.
+
 Basic Installation
 ==================

--- a/56
+++ b/56
@ -1,56 +0,0 @@
-Component: Atomic Operations
-Maintainer: Martin Sustrik
-Contact: sustrik@250bpm.com
-
-Component: Lock-free Algorithms
-Maintainer: Martin Sustrik
-Contact: sustrik@250bpm.com
-
-Component: TCP transport
-Maintainer: Martin Sustrik
-Contact: sustrik@250bpm.com
-
-Component: IPC transport
-Maintainer: Martin Sustrik
-Contact: sustrik@250bpm.com
-
-Component: PGM transport
-Maintainer: Martin Sustrik
-Contact: sustrik@250bpm.com
-
-Component: In-process transport
-Maintainer: Martin Sustrik
-Contact: sustrik@250bpm.com
-
-Component: I/O Threads
-Maintainer: Martin Sustrik
-Contact: sustrik@250bpm.com
-
-Component: Application Threads and Differnet Socket Types
-Maintainer: Martin Sustrik
-Contact: sustrik@250bpm.com
-
-Component: Multiplexing (zmq_poll)
-Maintainer: Martin Sustrik
-Contact: sustrik@250bpm.com
-
-Component: Generic Infrastructure (context, mailbox, command, pipe)
-Maintainer: Martin Sustrik
-Contact: sustrik@250bpm.com
-
-Component: Documentation
-Maintainer: Martin Sustrik
-Contact: sustrik@250bpm.com
-
-Component: Autotools build system
-Maintainer: Mikko Koppanen
-Contact: mikko.koppanen@gmail.com
-
-Component: MSVC build system
-Maintainer: Martin Sustrik
-Contact: sustrik@250bpm.com
-
-Component: Performance tests
-Maintainer: Martin Sustrik
-Contact: sustrik@250bpm.com
-
--- a/Makefile.am
+++ b/Makefile.am
@ -45,6 +45,10 @@ src_libzmq_la_SOURCES = \
 	src/decoder.hpp \
 	src/devpoll.cpp \
 	src/devpoll.hpp \
+	src/dgram.cpp \
+	src/dgram.hpp \
+	src/dish.cpp \
+	src/dish.hpp \
 	src/dist.cpp \
 	src/dist.hpp \
 	src/encoder.hpp \
@ -55,6 +59,8 @@ src_libzmq_la_SOURCES = \
 	src/fd.hpp \
 	src/fq.cpp \
 	src/fq.hpp \
+	src/gather.cpp \
+	src/gather.hpp \
 	src/gssapi_mechanism_base.cpp \
 	src/gssapi_mechanism_base.hpp \
 	src/gssapi_client.cpp \
@ -83,6 +89,7 @@ src_libzmq_la_SOURCES = \
 	src/lb.cpp \
 	src/lb.hpp \
 	src/likely.hpp \
+	src/macros.hpp \
 	src/mailbox.cpp \
 	src/mailbox.hpp \
 	src/mailbox_safe.cpp \
@ -126,6 +133,10 @@ src_libzmq_la_SOURCES = \
 	src/poller.hpp \
 	src/poller_base.cpp \
 	src/poller_base.hpp \
+	src/pollset.cpp \
+	src/pollset.hpp \
+	src/precompiled.cpp \
+	src/precompiled.hpp \
 	src/proxy.cpp \
 	src/proxy.hpp \
 	src/pub.cpp \
@ -134,6 +145,8 @@ src_libzmq_la_SOURCES = \
 	src/pull.hpp \
 	src/push.cpp \
 	src/push.hpp \
+	src/radio.cpp \
+	src/radio.hpp \
 	src/random.cpp \
 	src/random.hpp \
 	src/raw_decoder.cpp \
@ -148,6 +161,8 @@ src_libzmq_la_SOURCES = \
 	src/req.hpp \
 	src/router.cpp \
 	src/router.hpp \
+	src/scatter.cpp \
+	src/scatter.hpp \
 	src/select.cpp \
 	src/select.hpp \
 	src/server.cpp \
@ -179,6 +194,8 @@ src_libzmq_la_SOURCES = \
 	src/tcp_listener.hpp \
 	src/thread.cpp \
 	src/thread.hpp \
+	src/timers.cpp \
+	src/timers.hpp \
 	src/tipc_address.cpp \
 	src/tipc_address.hpp \
 	src/tipc_connecter.cpp \
@ -187,6 +204,10 @@ src_libzmq_la_SOURCES = \
 	src/tipc_listener.hpp \
 	src/trie.cpp \
 	src/trie.hpp \
+	src/udp_address.cpp \
+	src/udp_address.hpp \
+	src/udp_engine.cpp \
+	src/udp_engine.hpp \
 	src/v1_decoder.cpp \
 	src/v1_decoder.hpp \
 	src/v2_decoder.cpp \
@ -196,10 +217,18 @@ src_libzmq_la_SOURCES = \
 	src/v2_encoder.cpp \
 	src/v2_encoder.hpp \
 	src/v2_protocol.hpp \
+	src/vmci.cpp \
+	src/vmci.hpp \
+	src/vmci_address.cpp \
+	src/vmci_address.hpp \
+	src/vmci_connecter.cpp \
+	src/vmci_connecter.hpp \
+	src/vmci_listener.cpp \
+	src/vmci_listener.hpp \
 	src/windows.hpp \
 	src/wire.hpp \
-	src/xpub.hpp \
 	src/xpub.cpp \
+	src/xpub.hpp \
 	src/xsub.cpp \
 	src/xsub.hpp \
 	src/ypipe.hpp \
@ -208,11 +237,17 @@ src_libzmq_la_SOURCES = \
 	src/yqueue.hpp \
 	src/zmq.cpp \
 	src/zmq_utils.cpp \
-        src/decoder_allocators.hpp \
-        src/decoder_allocators.cpp \
-        src/socket_poller.hpp \
-        src/socket_poller.cpp
+	src/decoder_allocators.cpp \
+	src/decoder_allocators.hpp \
+	src/socket_poller.cpp \
+	src/socket_poller.hpp \
+	src/zmq_draft.h

+if USE_TWEETNACL
+src_libzmq_la_SOURCES += \
+	src/tweetnacl.c \
+	src/tweetnacl.h
+endif

 if ON_MINGW
 src_libzmq_la_LDFLAGS = \
@ -249,11 +284,13 @@ endif
 endif
 endif

-src_libzmq_la_CPPFLAGS =
-src_libzmq_la_CXXFLAGS = @LIBZMQ_EXTRA_CXXFLAGS@
-src_libzmq_la_LIBADD =
+src_libzmq_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) $(LIBUNWIND_CFLAGS)
+src_libzmq_la_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(LIBUNWIND_CFLAGS)
+src_libzmq_la_CXXFLAGS = @LIBZMQ_EXTRA_CXXFLAGS@ $(CODE_COVERAGE_CXXFLAGS) \
+	$(LIBUNWIND_CFLAGS)
+src_libzmq_la_LIBADD = $(CODE_COVERAGE_LDFLAGS) $(LIBUNWIND_LIBS)

-if HAVE_SODIUM
+if USE_LIBSODIUM
 src_libzmq_la_CPPFLAGS += ${sodium_CFLAGS}
 src_libzmq_la_LIBADD += ${sodium_LIBS}
 endif
@ -302,6 +339,7 @@ endif
 # tests
 #
 test_apps = \
+	tests/test_ancillaries \
 	tests/test_system \
 	tests/test_pair_inproc \
 	tests/test_pair_tcp \
@ -351,8 +389,8 @@ test_apps = \
 	tests/test_proxy_single_socket \
 	tests/test_proxy_terminate \
 	tests/test_getsockopt_memset \
+	tests/test_setsockopt \
 	tests/test_many_sockets \
-	tests/test_ipc_wildcard \
 	tests/test_diffserv \
 	tests/test_connect_rid \
 	tests/test_bind_src_address \
@ -362,12 +400,16 @@ test_apps = \
 	tests/test_xpub_manual \
 	tests/test_xpub_welcome_msg \
 	tests/test_atomics \
-	tests/test_client_server \
-	tests/test_thread_safe \
-	tests/test_socketopt_hwm \
+	tests/test_sockopt_hwm \
 	tests/test_heartbeats \
 	tests/test_stream_exceeds_buffer \
-	tests/test_poller
+	tests/test_pub_invert_matching \
+	tests/test_base85 \
+	tests/test_bind_after_connect_tcp \
+	tests/test_sodium
+
+tests_test_ancillaries_SOURCES = tests/test_ancillaries.cpp
+tests_test_ancillaries_LDADD = src/libzmq.la

 tests_test_system_SOURCES = tests/test_system.cpp
 tests_test_system_LDADD = src/libzmq.la
@ -527,9 +569,6 @@ tests_test_getsockopt_memset_LDADD = src/libzmq.la
 tests_test_many_sockets_SOURCES = tests/test_many_sockets.cpp
 tests_test_many_sockets_LDADD = src/libzmq.la

-tests_test_ipc_wildcard_SOURCES = tests/test_ipc_wildcard.cpp
-tests_test_ipc_wildcard_LDADD = src/libzmq.la
-
 tests_test_diffserv_SOURCES = tests/test_diffserv.cpp
 tests_test_diffserv_LDADD = src/libzmq.la

@ -557,14 +596,11 @@ tests_test_xpub_welcome_msg_LDADD = src/libzmq.la
 tests_test_atomics_SOURCES = tests/test_atomics.cpp
 tests_test_atomics_LDADD = src/libzmq.la

-tests_test_client_server_SOURCES = tests/test_client_server.cpp
-tests_test_client_server_LDADD = src/libzmq.la
+tests_test_sockopt_hwm_SOURCES = tests/test_sockopt_hwm.cpp
+tests_test_sockopt_hwm_LDADD = src/libzmq.la

-tests_test_thread_safe_SOURCES = tests/test_thread_safe.cpp
-tests_test_thread_safe_LDADD = src/libzmq.la
-
-tests_test_socketopt_hwm_SOURCES = tests/test_sockopt_hwm.cpp
-tests_test_socketopt_hwm_LDADD = src/libzmq.la
+tests_test_setsockopt_SOURCES = tests/test_setsockopt.cpp
+tests_test_setsockopt_LDADD = src/libzmq.la

 tests_test_heartbeats_SOURCES = tests/test_heartbeats.cpp
 tests_test_heartbeats_LDADD = src/libzmq.la
@ -572,22 +608,36 @@ tests_test_heartbeats_LDADD = src/libzmq.la
 tests_test_stream_exceeds_buffer_SOURCES = tests/test_stream_exceeds_buffer.cpp
 tests_test_stream_exceeds_buffer_LDADD = src/libzmq.la

-tests_test_poller_SOURCES = tests/test_poller.cpp
-tests_test_poller_LDADD = src/libzmq.la
+tests_test_pub_invert_matching_SOURCES = tests/test_pub_invert_matching.cpp
+tests_test_pub_invert_matching_LDADD = src/libzmq.la

+tests_test_bind_after_connect_tcp_SOURCES = tests/test_bind_after_connect_tcp.cpp
+tests_test_bind_after_connect_tcp_LDADD = src/libzmq.la
+
+tests_test_base85_SOURCES = tests/test_base85.cpp
+tests_test_base85_LDADD = src/libzmq.la
+
+tests_test_sodium_SOURCES = tests/test_sodium.cpp
+tests_test_sodium_LDADD = src/libzmq.la

 if !ON_MINGW
 if !ON_CYGWIN
 test_apps += \
 	tests/test_shutdown_stress \
+	tests/test_ipc_wildcard \
 	tests/test_pair_ipc \
 	tests/test_reqrep_ipc \
+	tests/test_use_fd_ipc \
+	tests/test_use_fd_tcp \
 	tests/test_timeo \
 	tests/test_filter_ipc

 tests_test_shutdown_stress_SOURCES = tests/test_shutdown_stress.cpp
 tests_test_shutdown_stress_LDADD = src/libzmq.la

+tests_test_ipc_wildcard_SOURCES = tests/test_ipc_wildcard.cpp
+tests_test_ipc_wildcard_LDADD = src/libzmq.la
+
 tests_test_pair_ipc_SOURCES = \
 	tests/test_pair_ipc.cpp \
 	tests/testutil.hpp
@ -604,7 +654,18 @@ tests_test_timeo_LDADD = src/libzmq.la
 tests_test_filter_ipc_SOURCES = tests/test_filter_ipc.cpp
 tests_test_filter_ipc_LDADD = src/libzmq.la

+tests_test_use_fd_ipc_SOURCES = \
+	tests/test_use_fd_ipc.cpp \
+	tests/testutil.hpp
+tests_test_use_fd_ipc_LDADD = src/libzmq.la
+
+tests_test_use_fd_tcp_SOURCES = \
+	tests/test_use_fd_tcp.cpp \
+	tests/testutil.hpp
+tests_test_use_fd_tcp_LDADD = src/libzmq.la
+
 if HAVE_FORK
+if !VALGRIND_ENABLED
 test_apps += tests/test_fork

 tests_test_fork_SOURCES = tests/test_fork.cpp
@ -613,6 +674,7 @@ tests_test_fork_LDADD = src/libzmq.la
 endif
 endif
 endif
+endif

 if BUILD_TIPC
 test_apps += \
@ -659,6 +721,56 @@ tests_test_abstract_ipc_LDADD = src/libzmq.la

 endif

+if HAVE_VMCI
+test_apps += test_pair_vmci test_reqrep_vmci
+
+test_pair_vmci_SOURCES = tests/test_pair_vmci.cpp
+test_pair_vmci_LDADD = libzmq.la
+test_pair_vmci_LDFLAGS = @LIBZMQ_VMCI_LDFLAGS@
+test_pair_vmci_CXXFLAGS = @LIBZMQ_VMCI_CXXFLAGS@
+
+test_reqrep_vmci_SOURCES = tests/test_reqrep_vmci.cpp
+test_reqrep_vmci_LDADD = libzmq.la
+test_reqrep_vmci_LDFLAGS = @LIBZMQ_VMCI_LDFLAGS@
+test_reqrep_vmci_CXXFLAGS = @LIBZMQ_VMCI_CXXFLAGS@
+
+endif
+
+if ENABLE_DRAFTS
+test_apps += tests/test_poller \
+	tests/test_client_server \
+	tests/test_thread_safe \
+	tests/test_timers \
+	tests/test_radio_dish \
+	tests/test_udp \
+	tests/test_scatter_gather \
+	tests/test_dgram
+
+tests_test_poller_SOURCES = tests/test_poller.cpp
+tests_test_poller_LDADD = src/libzmq.la
+
+tests_test_client_server_SOURCES = tests/test_client_server.cpp
+tests_test_client_server_LDADD = src/libzmq.la
+
+tests_test_thread_safe_SOURCES = tests/test_thread_safe.cpp
+tests_test_thread_safe_LDADD = src/libzmq.la
+
+tests_test_timers_SOURCES = tests/test_timers.cpp
+tests_test_timers_LDADD = src/libzmq.la
+
+tests_test_radio_dish_SOURCES = tests/test_radio_dish.cpp
+tests_test_radio_dish_LDADD = src/libzmq.la
+
+tests_test_udp_SOURCES = tests/test_udp.cpp
+tests_test_udp_LDADD = src/libzmq.la
+
+tests_test_scatter_gather_SOURCES = tests/test_scatter_gather.cpp
+tests_test_scatter_gather_LDADD = src/libzmq.la
+
+tests_test_dgram_SOURCES = tests/test_dgram.cpp
+tests_test_dgram_LDADD = src/libzmq.la
+endif
+
 check_PROGRAMS = ${test_apps}

 #  Run the test cases
@ -669,13 +781,19 @@ if !ON_LINUX
 XFAIL_TESTS += tests/test_abstract_ipc
 endif

+if ON_GNU
+XFAIL_TESTS += test_ipc_wildcard \
+		test_term_endpoint
+endif
+
 EXTRA_DIST = \
 	CMakeLists.txt \
 	autogen.sh	\
 	version.sh	\
-	MAINTAINERS	\
 	src/libzmq.pc.cmake.in \
 	src/libzmq.vers \
+	src/version.rc.in \
+	tests/CMakeLists.txt \
 	tools/curve_keygen.cpp

 MAINTAINERCLEANFILES = \
@ -684,6 +802,8 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/configure \
 	`find "$(srcdir)" -type f -name Makefile.in -print`

+@CODE_COVERAGE_RULES@
+
 dist-hook:
 	-rm $(distdir)/src/platform.hpp
 	@if test -d "$(srcdir)/.git"; \
@ -698,8 +818,10 @@ dist-hook:
 	else \
 		echo A git clone is required to generate a ChangeLog >&2; \
 	fi
-	-cp $(top_srcdir)/builds/redhat/zeromq.spec $(distdir)/zeromq.spec

 maintainer-clean-local:
 	-rm -rf $(top_srcdir)/config

+@VALGRIND_CHECK_RULES@
+
+VALGRIND_SUPPRESSIONS_FILES = builds/valgrind/valgrind.supp
--- a/README.doxygen.md
+++ b/README.doxygen.md
@ -0,0 +1,48 @@
+## Overview
+
+The ZeroMQ lightweight messaging kernel is a library which extends the
+standard socket interfaces with features traditionally provided by
+specialised messaging middleware products. ZeroMQ sockets provide an
+abstraction of asynchronous message queues, multiple messaging patterns,
+message filtering (subscriptions), seamless access to multiple transport
+protocols and more.
+
+This documentation describes the internal software that makes up the
+ZeroMQ C++ core engine, and not how to use its API, however it may help
+you understand certain aspects better, such as the callgraph of an API method.
+There are no instructions on using ZeroMQ within this documentation, only
+the API internals that make up the software.
+
+**Note:** this documentation is generated directly from the source code with
+Doxygen. Since this project is constantly under active development, what you
+are about to read may be out of date! If you notice any errors in the
+documentation, or the code comments, then please send a pull request.
+
+Please refer to the README file for anything else.
+## Resources
+
+Extensive documentation is provided with the distribution. Refer to
+doc/zmq.html, or "man zmq" after you have installed libzmq on your system.
+
+* Website: http://www.zeromq.org/
+* Official API documentation: http://api.zeromq.org/
+
+Development mailing list: zeromq-dev@lists.zeromq.org
+
+Announcements mailing list: zeromq-announce@lists.zeromq.org
+
+Git repository: http://github.com/zeromq/libzmq
+
+ZeroMQ developers can also be found on the IRC channel \#zeromq, on the
+Freenode network (irc.freenode.net).
+
+## Copyright
+Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file.  
+The project license is specified in COPYING and COPYING.LESSER.
+
+The names "ØMQ", "ZeroMQ", "0MQ", and the ØMQ logo are registered trademarks
+of iMatix Corporation ("iMatix") and refers to either (a) the original libzmq
+C++ library, or (b) the community of projects hosted in the
+https://github.com/zeromq organization.
+
+This Doxygen configuration is adapted by Hiten Pandya, for the ZeroMQ project.
--- a/README.md
+++ b/README.md
@ -2,6 +2,7 @@

 [![Build Status](https://travis-ci.org/zeromq/libzmq.png?branch=master)](https://travis-ci.org/zeromq/libzmq)
 [![Build status](https://ci.appveyor.com/api/projects/status/e2ks424yrs1un3wt?svg=true)](https://ci.appveyor.com/project/zeromq/libzmq)
+[![Coverage Status](https://coveralls.io/repos/github/zeromq/libzmq/badge.svg?branch=master)](https://coveralls.io/github/zeromq/libzmq?branch=master)

 ## Welcome

--- a/RELICENSE/README.md
+++ b/RELICENSE/README.md
@ -0,0 +1,23 @@
+# Permission to Relicense under MPLV2
+
+This directory collects grants from individuals and firms that hold
+copyrights in ZeroMQ to permit licensing the ZeroMQ code under
+the [Mozilla Public License, version
+2](https://www.mozilla.org/en-US/MPL/2.0/).  See [GitHub Pull
+Request #1917](https://github.com/zeromq/libzmq/pull/1917),
+the [0MQ Licensing Page](http://zeromq.org/area:licensing) and
+[original iMatix zeromq-dev license
+grant](http://lists.zeromq.org/pipermail/zeromq-dev/2016-April/030288.html)
+for some background information.
+
+Please create a separate file in this directory for each individual
+or firm holding copyright in ZeroMQ, named after the individual or
+firm holding the copyright.
+
+Each patch must be made with a GitHub handle that is clearly
+associated with the copyright owner, to guarantee the identity of
+the signatory.  Please avoid changing the files created by other
+individuals or firms granting a copyright license over their
+copyrights (if rewording is required contact them and ask them to
+submit an updated version).  This makes it easier to verify that
+the license grant was made by an authorized GitHub account.
--- a/RELICENSE/brocade_communications_systems.md
+++ b/RELICENSE/brocade_communications_systems.md
@ -0,0 +1,15 @@
+## Brocade Communications Systems Inc.
+
+This is a statement by Brocade Communications Systems Inc. (Brocade)
+that grants permission to relicense its copyrights in the libzmq C++
+library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
+
+A portion of the commits made by the Github handle "bluca", with
+commit author "Luca Boccassi <luca.boccassi@gmail.com>" or
+"Luca Boccassi <lboccass@brocade.com>", are copyright of Brocade.
+This permission to relicense includes all past, present and future
+contributions of Brocade employees.
+
+Luca Boccassi
+Software Engineer, Brocade Communications Systems Inc.
+2016-05-16
--- a/RELICENSE/imatix.md
+++ b/RELICENSE/imatix.md
@ -0,0 +1,23 @@
+# Permission to Relicense under MPLV2
+
+This document collects grants from firms that hold copyrights in ZeroMQ. Please add new firms at the start. Each patch must be made with a GitHub handle that guarantees identity of the signatory.
+
+## iMatix Corporation
+
+This is a statement by iMatix Corporation sprl (iMatix) that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
+
+1. The original ZeroMQ codebase was developed from 2007-2009 by FastMQ Inc. (FastMQ) in Slovakia, which held all copyrights in code written by its staff.
+
+2. On 2009-11-01, iMatix exercised an option to acquire FastMQ and its assets,
+including ZeroMQ. On or before 2010-01-05 the FastMQ copyrights in ZeroMQ were
+transferred to iMatix ([commit](https://github.com/zeromq/libzmq/commit/4f6baf4dde627656b63cc4e2acdb78a8577ba640)). The FastMQ legal entity was subsequently liquidated.
+
+3. Between 2009 and 2016, iMatix has continued to add contributions to ZeroMQ under the GitHub handle 'hintjens'.
+
+4. This grant therefore covers what remains of the original FastMQ codebase plus all later contributions.
+
+5. iMatix hereby grants an irrevocable, global, and fully paid-up license on all its copyrights that exist in ZeroMQ, under the MPLv2.
+
+-Pieter Hintjens
+CEO, iMatix Corporation sprl
+23 April 2016
--- a/RELICENSE/naos_ltd.md
+++ b/RELICENSE/naos_ltd.md
@ -0,0 +1,19 @@
+## Naos Ltd (a New Zealand company)
+
+This is a statement by Naos Ltd (Naos) that grants permission to
+relicense its copyrights in the libzmq C++ library (ZeroMQ) under
+the Mozilla Public License v2 (MPLv2).
+
+The port of libzmq to run on the z/OS Mainframe ([GitHub Pull
+request #1136](https://github.com/zeromq/libzmq/pull/1136), [GitHub Pull
+request #1138](https://github.com/zeromq/libzmq/pull/1138), and
+[GitHub Pull request #1139](https://github.com/zeromq/libzmq/pull/1139))
+was performed as work for hire under contract to iMatix Corporation
+sprl, itself under contract to a client.  Thus copyright in that
+portability work does not belong to Naos Ltd, and Naos Ltd hereby
+releases any claim to the copyright in the z/OS Mainframe portability
+work identified by the above three GitHub pull requests.
+
+Ewen McNeill  
+Managing Director, Naos Ltd  
+2016-04-25
--- a/acinclude.m4
+++ b/acinclude.m4
@ -7,7 +7,7 @@ AC_DEFUN([LIBZMQ_CONFIG_LIBTOOL],  [{

    # Libtool configuration for different targets
    case "${host_os}" in
-        *mingw32*|*cygwin*)
+        *mingw*|*cygwin*)
            # Disable static build by default
            AC_DISABLE_STATIC
        ;;
@ -88,11 +88,15 @@ dnl # LIBZMQ_CHECK_DOC_BUILD
 dnl # Check whether to build documentation and install man-pages                 #
 dnl ##############################################################################
 AC_DEFUN([LIBZMQ_CHECK_DOC_BUILD], [{
-    # Allow user to disable doc build
-    AC_ARG_WITH([documentation], [AS_HELP_STRING([--without-documentation],
-        [disable documentation build even if asciidoc and xmlto are present [default=no]])])

-    if test "x$with_documentation" = "xno"; then
+    # Man pages are built/installed if asciidoc and xmlto are present
+    #   --with-docs=no overrides this
+    AC_ARG_WITH([docs],
+        AS_HELP_STRING([--without-docs],
+            [Don't build and install man pages [default=build]]),
+        [with_docs=$withval])
+
+    if test "x$with_docs" = "xno"; then
        libzmq_build_doc="no"
        libzmq_install_man="no"
    else
@ -113,7 +117,7 @@ AC_DEFUN([LIBZMQ_CHECK_DOC_BUILD], [{
        fi

        # Do not install man pages if on mingw
-        if test "x$libzmq_on_mingw32" = "xyes"; then
+        if test "x$libzmq_on_mingw" = "xyes"; then
            libzmq_install_man="no"
        fi
    fi
@ -275,7 +279,7 @@ AC_DEFUN([LIBZMQ_CHECK_ENABLE_DEBUG], [{

    # This flag is checked also in
    AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],
-        [Enable debugging information [default=no]])])
+        [enable debugging information [default=disabled]])])

    AC_MSG_CHECKING(whether to enable debugging information)

@ -326,7 +330,7 @@ AC_DEFUN([LIBZMQ_WITH_GCOV], [{
    AC_REQUIRE([LIBZMQ_CHECK_COMPILERS])

    AC_ARG_WITH(gcov, [AS_HELP_STRING([--with-gcov=yes/no],
-                      [With GCC Code Coverage reporting.])],
+                      [with GCC Code Coverage reporting.])],
                      [ZMQ_GCOV="$withval"])

    AC_MSG_CHECKING(whether to enable code coverage)
@ -777,20 +781,17 @@ dnl # LIBZMQ_CHECK_POLLER_KQUEUE([action-if-found], [action-if-not-found])
 dnl # Checks kqueue polling system                                                 #
 dnl ################################################################################
 AC_DEFUN([LIBZMQ_CHECK_POLLER_KQUEUE], [{
-    AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM(
-        [
+    AC_LINK_IFELSE([
+        AC_LANG_PROGRAM([
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
-        ],
-[[
+        ],[[
 struct kevent t_kev;
 kqueue();
-]]
-        )],
-        [libzmq_cv_have_poller_kqueue="yes" ; $1],
-        [libzmq_cv_have_poller_kqueue="no" ; $2])
+        ]])],
+        [$1], [$2]
+    )
 }])

 dnl ################################################################################
@ -799,35 +800,27 @@ dnl # Checks epoll polling system can actually run #
 dnl # For cross-compile, only requires that epoll can link #
 dnl ################################################################################
 AC_DEFUN([LIBZMQ_CHECK_POLLER_EPOLL], [{
-    AC_RUN_IFELSE(
-        [AC_LANG_PROGRAM(
-        [
+    AC_RUN_IFELSE([
+        AC_LANG_PROGRAM([
 #include <sys/epoll.h>
-        ],
-[[
+        ],[[
 struct epoll_event t_ev;
 int r;
 r = epoll_create(10);
 return(r < 0);
-]]
-        )],
-        [libzmq_cv_have_poller_epoll="yes" ; $1],
-        [libzmq_cv_have_poller_epoll="no" ; $2],
-        [
-          AC_LINK_IFELSE(
-              [AC_LANG_PROGRAM(
-              [
+        ]])],
+        [$1],[$2],[
+            AC_LINK_IFELSE([
+                AC_LANG_PROGRAM([
 #include <sys/epoll.h>
-              ],
-      [[
-      struct epoll_event t_ev;
-      epoll_create(10);
-      ]]
-              )],
-              [libzmq_cv_have_poller_epoll="yes" ; $1],
-              [libzmq_cv_have_poller_epoll="no" ; $2])
-
-        ])
+                ],[[
+struct epoll_event t_ev;
+epoll_create(10);
+                ]])],
+                [$1], [$2]
+            )
+        ]
+    )
 }])

 dnl ################################################################################
@ -835,18 +828,31 @@ dnl # LIBZMQ_CHECK_POLLER_DEVPOLL([action-if-found], [action-if-not-found])
 dnl # Checks devpoll polling system                                                #
 dnl ################################################################################
 AC_DEFUN([LIBZMQ_CHECK_POLLER_DEVPOLL], [{
-    AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM(
-        [
+    AC_LINK_IFELSE([
+        AC_LANG_PROGRAM([
 #include <sys/devpoll.h>
-        ],
-[[
+        ],[[
 struct pollfd t_devpoll;
 int fd = open("/dev/poll", O_RDWR);
-]]
-        )],
-        [libzmq_cv_have_poller_devpoll="yes" ; $1],
-        [libzmq_cv_have_poller_devpoll="no" ; $2])
+        ]])],
+        [$1], [$2]
+    )
+}])
+
+dnl ################################################################################
+dnl # LIBZMQ_CHECK_POLLER_POLLSET([action-if-found], [action-if-not-found])        #
+dnl # Checks pollset polling system                                                #
+dnl ################################################################################
+AC_DEFUN([LIBZMQ_CHECK_POLLER_POLLSET], [{
+    AC_LINK_IFELSE([
+        AC_LANG_PROGRAM([
+#include <sys/poll.h>
+#include <sys/pollset.h>
+        ],[[
+pollset_t ps = pollset_create(-1);
+        ]])],
+        [$1], [$2]
+    )
 }])

 dnl ################################################################################
@ -854,18 +860,15 @@ dnl # LIBZMQ_CHECK_POLLER_POLL([action-if-found], [action-if-not-found])
 dnl # Checks poll polling system                                                   #
 dnl ################################################################################
 AC_DEFUN([LIBZMQ_CHECK_POLLER_POLL], [{
-    AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM(
-        [
+    AC_LINK_IFELSE([
+        AC_LANG_PROGRAM([
 #include <poll.h>
-        ],
-[[
+        ],[[
 struct pollfd t_poll;
 poll(&t_poll, 1, 1);
-]]
-        )],
-        [libzmq_cv_have_poller_poll="yes" ; $1],
-        [libzmq_cv_have_poller_poll="no" ; $2])
+        ]])],
+        [$1], [$2]
+    )
 }])

 dnl ################################################################################
@ -873,9 +876,8 @@ dnl # LIBZMQ_CHECK_POLLER_SELECT([action-if-found], [action-if-not-found])
 dnl # Checks select polling system                                                 #
 dnl ################################################################################
 AC_DEFUN([LIBZMQ_CHECK_POLLER_SELECT], [{
-    AC_LINK_IFELSE(
-        [AC_LANG_PROGRAM(
-        [
+    AC_LINK_IFELSE([
+        AC_LANG_PROGRAM([
 #ifdef ZMQ_HAVE_WINDOWS
 #include "winsock2.h"
 #elif defined ZMQ_HAVE_OPENVMS
@ -884,79 +886,91 @@ AC_DEFUN([LIBZMQ_CHECK_POLLER_SELECT], [{
 #else
 #include <sys/select.h>
 #endif
-        ],
-[[
+        ],[[
 fd_set t_rfds;
 struct timeval tv;
-
 FD_ZERO(&t_rfds);
 FD_SET(0, &t_rfds);
-
 tv.tv_sec = 5;
 tv.tv_usec = 0;
-
 select(1, &t_rfds, NULL, NULL, &tv);
-]]
-        )],
-        [libzmq_cv_have_poller_select="yes" ; $1],
-        [libzmq_cv_have_poller_select="no" ; $2])
+        ]])],
+        [$1],[$2]
+    )
 }])

 dnl ################################################################################
 dnl # LIBZMQ_CHECK_POLLER([action-if-found], [action-if-not-found])                #
 dnl # Choose polling system                                                        #
 dnl ################################################################################
+
 AC_DEFUN([LIBZMQ_CHECK_POLLER], [{
-
    # Allow user to override poller autodetection
-    AC_ARG_WITH([poller], [AS_HELP_STRING([--with-poller],
-                [choose polling system manually. valid values are kqueue, epoll, devpoll, poll or select [default=autodetect]])])
+    AC_ARG_WITH([poller],
+        [AS_HELP_STRING([--with-poller],
+        [choose polling system manually. Valid values are 'kqueue', 'epoll', 'devpoll', 'pollset', 'poll', 'select', or 'auto'. [default=auto]])])

-    case "${with_poller}" in
-        kqueue|epoll|devpoll|poll|select)
-            # User has chosen polling system
-            AC_MSG_CHECKING([for suitable polling system skipped for preselect])
-            libzmq_cv_poller="${with_poller}"
-        ;;
+    if test "x$with_poller" == "x"; then
+        pollers=auto
+    else
+        pollers=$with_poller
+    fi
+    if test "$pollers" == "auto"; then
+        # We search for pollers in this order
+        pollers="kqueue epoll devpoll pollset poll select"
+    fi

-        *)
-            # try to find suitable polling system. the order of testing is:
-            # kqueue -> epoll -> devpoll -> poll -> select
-            AC_MSG_CHECKING([for suitable polling system])
-            for subsystem in kqueue epoll devpoll poll select; do
-
-                case "${subsystem}" in
-                    kqueue)
-                        LIBZMQ_CHECK_POLLER_KQUEUE([libzmq_cv_poller=$subsystem], [])
-                    ;;
-
-                    epoll)
-                        LIBZMQ_CHECK_POLLER_EPOLL([libzmq_cv_poller=$subsystem], [])
-                    ;;
-
-                    devpoll)
-                        LIBZMQ_CHECK_POLLER_DEVPOLL([libzmq_cv_poller=$subsystem], [])
-                    ;;
-
-                    poll)
-                        LIBZMQ_CHECK_POLLER_POLL([libzmq_cv_poller=$subsystem], [])
-                    ;;
-
-                    select)
-                        LIBZMQ_CHECK_POLLER_SELECT([libzmq_cv_poller=$subsystem], [])
-                    ;;
-                esac
-
-                if test "x${libzmq_cv_poller}" != "x"; then
-                    break
-                fi
-            done
-      ;;
-    esac
-
-    libzmq_cv_poller_flag=`echo "ZMQ_USE_${libzmq_cv_poller}" | tr a-z A-Z`
-
-    AS_IF([test "x${libzmq_cv_poller}" != "x"],
-          [AC_MSG_RESULT([using $libzmq_cv_poller]) ; $1], [AC_MSG_RESULT(no suitable polling system found) ; $2])
+    # try to find suitable polling system. the order of testing is:
+    AC_MSG_NOTICE([Choosing polling system from '$pollers'...])
+    poller_found=0
+    for poller in $pollers; do
+        case "$poller" in
+            kqueue)
+                LIBZMQ_CHECK_POLLER_KQUEUE([
+                    AC_MSG_NOTICE([Using 'kqueue' polling system])
+                    AC_DEFINE(ZMQ_USE_KQUEUE, 1, [Use 'kqueue' polling system])
+                    poller_found=1
+                ])
+            ;;
+            epoll)
+                LIBZMQ_CHECK_POLLER_EPOLL([
+                    AC_MSG_NOTICE([Using 'epoll' polling system])
+                    AC_DEFINE(ZMQ_USE_EPOLL, 1, [Use 'epoll' polling system])
+                    poller_found=1
+                ])
+            ;;
+            devpoll)
+                LIBZMQ_CHECK_POLLER_DEVPOLL([
+                    AC_MSG_NOTICE([Using 'devpoll' polling system])
+                    AC_DEFINE(ZMQ_USE_DEVPOLL, 1, [Use 'devpoll' polling system])
+                    poller_found=1
+                ])
+            ;;
+            pollset)
+                LIBZMQ_CHECK_POLLER_POLLSET([
+                    AC_MSG_NOTICE([Using 'pollset' polling system])
+                    AC_DEFINE(ZMQ_USE_POLLSET, 1, [Use 'pollset' polling system])
+                    poller_found=1
+                ])
+            ;;
+            poll)
+                LIBZMQ_CHECK_POLLER_POLL([
+                    AC_MSG_NOTICE([Using 'poll' polling system])
+                    AC_DEFINE(ZMQ_USE_POLL, 1, [Use 'poll' polling system])
+                    poller_found=1
+                ])
+            ;;
+            select)
+                LIBZMQ_CHECK_POLLER_SELECT([
+                    AC_MSG_NOTICE([Using 'select' polling system])
+                    AC_DEFINE(ZMQ_USE_SELECT, 1, [Use 'select' polling system])
+                    poller_found=1
+                ])
+            ;;
+        esac
+        test $poller_found -eq 1 && break
+    done
+    if test $poller_found -eq 0; then
+        AC_MSG_ERROR([None of '$pollers' are valid pollers on this platform])
+    fi
 }])
-
--- a/appveyor.yml
+++ b/appveyor.yml
@ -54,7 +54,7 @@ install:
  - cmd: echo "Generator='%CMAKE_GENERATOR%'"
  - cmd: echo "Platform='%Platform%'"
  - cmd: set LIBSODIUMDIR=C:\projects\libsodium
-  - cmd: git clone --depth 1 --quiet "https://github.com/jedisct1/libsodium.git" %LIBSODIUMDIR%
+  - cmd: git clone --branch stable --depth 1 --quiet "https://github.com/jedisct1/libsodium.git" %LIBSODIUMDIR%
  - cmd: msbuild /v:minimal /maxcpucount:%NUMBER_OF_PROCESSORS% /p:Configuration=%Configuration%DLL %LIBSODIUMDIR%\builds\msvc\%MSVCYEAR%\libsodium\libsodium.vcxproj
  - cmd: set SODIUM_LIBRARY_DIR="%LIBSODIUMDIR%\bin\%Platform%\%Configuration%\%MSVCVERSION%\dynamic"
  - cmd: set SODIUM_INCLUDE_DIR="%LIBSODIUMDIR%\src\libsodium\include"
--- a/builds/Makefile.am
+++ b/builds/Makefile.am
@ -21,14 +21,11 @@ EXTRA_DIST = \
 	cmake/Modules/ZMQSourceRunChecks.cmake \
 	cmake/NSIS.template32.in \
 	cmake/platform.hpp.in \
-	cmake/Makefile.am \
-	cmake/Makefile \
 	cmake/NSIS.template64.in \
-	cmake/Makefile.in \
 	valgrind/valgrind.supp \
 	valgrind/vg \
 	nuget/readme.nuget \
 	nuget/libzmq.autopkg \
-	qt-android/android_build_helper.sh \
-	qt-android/ci_build.sh \
-	qt-android/build.sh
+	android/android_build_helper.sh \
+	android/ci_build.sh \
+	android/build.sh
--- a/builds/README
+++ b/builds/README
@ -0,0 +1,4 @@
+This directory holds build tools, i.e. tools we use to build the current
+code tree. Packaging tools (which take released tarballs or github code
+repos) should go into /packaging.
+
--- a/builds/android/Dockerfile
+++ b/builds/android/Dockerfile
@ -0,0 +1,22 @@
+FROM ubuntu:14.04
+MAINTAINER Benjamin Henrion <zoobab@gmail.com>
+ 
+RUN DEBIAN_FRONTEND=noninteractive apt-get update -y -q
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --force-yes tar git curl nano wget dialog net-tools build-essential vim emacs apt-utils file uuid-dev cmake asciidoc python autoconf automake libtool pkg-config xmlto sudo gettext apt-utils
+
+RUN useradd -d /home/zmq -m -s /bin/bash zmq
+RUN echo "zmq ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/zmq
+RUN chmod 0440 /etc/sudoers.d/zmq
+
+USER zmq
+# install android-ndk
+RUN cd ~ && wget -q http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin -O android-ndk-r10e-linux-x86_64.bin && chmod +x android-ndk-r10e-linux-x86_64.bin
+RUN cd ~ && ./android-ndk-r10e-linux-x86_64.bin
+ENV ANDROID_NDK_ROOT /home/zmq/android-ndk-r10e
+ENV TOOLCHAIN_NAME arm-linux-androideabi-4.9
+ENV TOOLCHAIN_HOST arm-linux-androideabi
+ENV TOOLCHAIN_PATH ${ANDROID_NDK_ROOT}/toolchains/${TOOLCHAIN_NAME}/prebuilt/linux-x86_64/bin
+ENV TOOLCHAIN_ARCH arm
+# build libzmq for android
+RUN cd ~ && git clone --depth 1 https://github.com/zeromq/libzmq.git
+RUN cd ~/libzmq/builds/android && ./build.sh
--- a/builds/android/README.md
+++ b/builds/android/README.md
@ -0,0 +1,78 @@
+LIBZMQ ANDROID COMPILATION STEPS
+================================
+To launch the docker build:
+
+    $ docker build .
+
+To launch the android build, you have to first install the android-ndk first in your HOME directory:
+
+    $ cd ~
+    $ export ANDROID_NDK_VERSION="r10e"
+    $ wget -q http://dl.google.com/android/ndk/android-ndk-${ANDROID_NDK_VERSION}-linux-x86_64.bin -O android-ndk-${ANDROID_NDK_VERSION}-linux-x86_64.bin
+    $ chmod +x android-ndk-${ANDROID_NDK_VERSION}-linux-x86_64.bin
+    $ ./android-ndk-r10e-linux-x86_64.bin
+    $ export ANDROID_NDK_ROOT /home/zmq/android-ndk-r10e
+    $ export TOOLCHAIN_NAME arm-linux-androideabi-4.9
+    $ export TOOLCHAIN_HOST arm-linux-androideabi
+    $ export TOOLCHAIN_PATH ${ANDROID_NDK_ROOT}/toolchains/${TOOLCHAIN_NAME}/prebuilt/linux-x86_64/bin
+    $ export TOOLCHAIN_ARCH arm
+
+Then you can launch the build:
+
+    $ cd ~/libzmq/builds/android
+    $ ./build.sh 
+    Cloning into 'libsodium'...
+    remote: Counting objects: 15246, done.
+    remote: Compressing objects: 100% (182/182), done.
+    Receiving objects:  16% (2440/15246)   
+    [...]
+
+A successful build should finish with the following message and give you back your shell prompt:
+
+    [...]
+    make[2]: Leaving directory '/tmp/android_build/arm-linux-androideabi-4.9/libzmq'
+    make[1]: Leaving directory '/tmp/android_build/arm-linux-androideabi-4.9/libzmq'
+    libzmq android build succeeded
+    $ 
+
+You will then be able to see libzmq.so compiled in the prefix/ directory:
+
+    $ cd ~/libzmq/builds/android/prefix/arm-linux-androideabi-4.9/lib
+    $ ls
+    libsodium.a  libsodium.la  libsodium.so  libzmq.a  libzmq.la  libzmq.so  pkgconfig
+
+You can then triple check that they are ARM libs:
+
+    $ cd ~/libzmq/builds/android/prefix/arm-linux-androideabi-4.9/lib
+    $ file libzmq.so
+    libzmq.so: ELF 32-bit LSB shared object, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /system/bin/linker, not stripped
+
+
+COMPILE WITH DOCKERFILE
+=======================
+
+To launch the docker build with a tagged image as a result:
+
+    $ cd ~/libzmq/builds/android
+    $ docker build -t libzmq-android:`date +"%y%m%d-%H%M%S"` .
+    $ docker build -t libzmq-android:latest .
+
+If it is successful, it will end by "libzmq android build succeeded" followed by the ContainerID "e53db616aff4":
+
+    [...]
+    make[2]: Leaving directory `/tmp/android_build/arm-linux-androideabi-4.9/libzmq'
+    make[1]: Leaving directory `/tmp/android_build/arm-linux-androideabi-4.9/libzmq'
+    libzmq android build succeeded
+    ---> e53db616aff4
+    Removing intermediate container 8a5f3e34f3da
+    Successfully built e53db616aff4
+    $
+
+    $ docker images
+    REPOSITORY          TAG                 IMAGE ID            CREATED             VIRTUAL SIZE
+    libzmq-android      151218-101411       e53db616aff4        18 hours ago        5.495 GB
+
+If you want to collect the artifacts on the build, you can specify a directory in your HOME directory, such as "$HOME/libzmq-android-bins" for example:
+    
+    $ mkdir -pv $HOME/libzmq-android-bins
+    $ docker run -v $HOME/libzmq-android-bins:/data libzmq-android:latest "cp -v /home/zmq/libzmq/builds/android/prefix/arm-linux-androideabi-4.9/lib/* /data"
--- a/builds/qt-android/android_build_helper.sh
+++ b/builds/qt-android/android_build_helper.sh
@ -75,17 +75,17 @@ function android_build_env {
    
    if [ -z "$ANDROID_NDK_ROOT" ]; then
        ANDROID_BUILD_FAIL+=("Please set the ANDROID_NDK_ROOT environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"/home/user/android/android-ndk-r9d\")")
+        ANDROID_BUILD_FAIL+=("  (eg. \"/home/user/android/android-ndk-r11c\")")
    fi
    
    if [ -z "$TOOLCHAIN_PATH" ]; then
        ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_PATH environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"/home/user/android/android-ndk-r9d/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin\")")
+        ANDROID_BUILD_FAIL+=("  (eg. \"/home/user/android/android-ndk-r11c/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin\")")
    fi
    
    if [ -z "$TOOLCHAIN_NAME" ]; then
        ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_NAME environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"arm-linux-androideabi-4.8\")")
+        ANDROID_BUILD_FAIL+=("  (eg. \"arm-linux-androideabi-4.9\")")
    fi
    
    if [ -z "$TOOLCHAIN_HOST" ]; then
@ -210,21 +210,21 @@ function _android_build_opts_process_cxx_stl {
        ;;
        esac
    ;;
-    gnustl_shared_48)
+    gnustl_shared_49)
        LIBS+=" -lgnustl_shared"
-        CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/include"
+        CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/include"
        case "${TOOLCHAIN_ARCH}" in
        arm)
-            LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi"
-            CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi/include"
+            LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi"
+            CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/armeabi/include"
        ;;
        x86)
-            LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86"
-            CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86/include"
+            LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86"
+            CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/x86/include"
        ;;
        mips)
-            LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips"
-            CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips/include"
+            LDFLAGS+=" -L${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips"
+            CPPFLAGS+=" -I${ANDROID_NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.9/libs/mips/include"
        ;;
        *)
            ANDROID_BUILD_FAIL+=("Unknown combination for ANDROID_BUILD_CXXSTL and TOOLCHAIN_ARCH")
--- a/builds/qt-android/build.sh
+++ b/builds/qt-android/build.sh
@ -8,7 +8,7 @@ ANDROID_BUILD_DIR="$(pwd)"
 source ${ANDROID_BUILD_DIR}/android_build_helper.sh

 # Choose a C++ standard library implementation from the ndk
-ANDROID_BUILD_CXXSTL="gnustl_shared_48"
+ANDROID_BUILD_CXXSTL="gnustl_shared_49"

 # Set up android build environment and set ANDROID_BUILD_OPTS array
 android_build_env
@ -25,35 +25,46 @@ if [[ $ANDROID_BUILD_CLEAN ]]; then
    rm -rf "${ANDROID_BUILD_PREFIX}"/*
 fi

-##
-# Build libsodium from latest master branch
+if [ -z $CURVE ]; then
+    CURVE="--disable-curve"
+    VERIFY="libzmq.so"
+elif [ $CURVE == "libsodium" ]; then
+    CURVE="--with-libsodium=yes"
+    VERIFY="libzmq.so libsodium.so"
+    ##
+    # Build libsodium from latest master branch

-(android_build_verify_so "libsodium.so" &> /dev/null) || {
-    rm -rf "${cache}/libsodium"
-    (cd "${cache}" && git clone git://github.com/jedisct1/libsodium.git) || exit 1
-    (cd "${cache}/libsodium" && ./autogen.sh \
-        && ./configure "${ANDROID_BUILD_OPTS[@]}" --disable-soname-versions \
-        && make \
-        && make install) || exit 1
-}
+    (android_build_verify_so "libsodium.so" &> /dev/null) || {
+        rm -rf "${cache}/libsodium"
+        (cd "${cache}" && git clone -b stable --depth 1 git://github.com/jedisct1/libsodium.git) || exit 1
+        (cd "${cache}/libsodium" && ./autogen.sh \
+            && ./configure --quiet "${ANDROID_BUILD_OPTS[@]}" --disable-soname-versions \
+            && make -j 4 \
+            && make install) || exit 1
+    }
+elif [ $CURVE == "tweetnacl" ]; then
+    # Default
+    CURVE=""
+    VERIFY="libzmq.so"
+fi

 ##
 # Build libzmq from local source

 LIBTOOL_EXTRA_LDFLAGS='-avoid-version'

-(android_build_verify_so "libzmq.so" "libsodium.so" &> /dev/null) || {
+(android_build_verify_so ${VERIFY} &> /dev/null) || {
    rm -rf "${cache}/libzmq"
    (cp -r ../.. "${cache}/libzmq" && cd "${cache}/libzmq" && make clean)
    
    (cd "${cache}/libzmq" && ./autogen.sh \
-        && ./configure "${ANDROID_BUILD_OPTS[@]}" --with-libsodium=yes \
-        && make \
+        && ./configure --quiet "${ANDROID_BUILD_OPTS[@]}" ${CURVE} --without-docs \
+        && make -j 4 \
        && make install) || exit 1
 }

 ##
 # Verify shared libraries in prefix

-android_build_verify_so "libsodium.so"
-android_build_verify_so "libzmq.so" "libsodium.so"
+android_build_verify_so ${VERIFY}
+echo "libzmq android build succeeded"
--- a/builds/qt-android/ci_build.sh
+++ b/builds/qt-android/ci_build.sh
@ -1,6 +1,7 @@
 #!/usr/bin/env bash

-NDK_VER=android-ndk-r10e
+NDK_VER=android-ndk-r11c
+NDK_ABI_VER=4.9

 if [ $TRAVIS_OS_NAME == "linux" ]
 then
@ -13,17 +14,16 @@ else
    exit 1
 fi

-export FILENAME=$NDK_VER-$NDK_PLATFORM.bin
+export FILENAME=$NDK_VER-$NDK_PLATFORM.zip

 (cd '/tmp' \
-    && wget http://dl.google.com/android/ndk/$FILENAME \
-    && chmod a+x $FILENAME \
-    && ./$FILENAME &> /dev/null ) || exit 1
+    && wget http://dl.google.com/android/repository/$FILENAME \
+    && unzip $FILENAME &> /dev/null ) || exit 1
 unset FILENAME

 export ANDROID_NDK_ROOT="/tmp/$NDK_VER"
-export TOOLCHAIN_PATH="$ANDROID_NDK_ROOT/toolchains/arm-linux-androideabi-4.8/prebuilt/$NDK_PLATFORM/bin"
-export TOOLCHAIN_NAME="arm-linux-androideabi-4.8"
+export TOOLCHAIN_PATH="$ANDROID_NDK_ROOT/toolchains/arm-linux-androideabi-$NDK_ABI_VER/prebuilt/$NDK_PLATFORM/bin"
+export TOOLCHAIN_NAME="arm-linux-androideabi-$NDK_ABI_VER"
 export TOOLCHAIN_HOST="arm-linux-androideabi"
 export TOOLCHAIN_ARCH="arm"

--- a/builds/cmake/Modules/ZMQSourceRunChecks.cmake
+++ b/builds/cmake/Modules/ZMQSourceRunChecks.cmake
@ -127,3 +127,37 @@ int main(int argc, char *argv [])
 "
    ZMQ_HAVE_TCP_KEEPALIVE)
 endmacro()
+
+
+macro(zmq_check_tcp_tipc)
+  message(STATUS "Checking whether TIPC is supported")
+  check_c_source_runs(
+    "
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/socket.h>
+#include <linux/tipc.h>
+
+int main(int argc, char *argv [])
+{
+    struct sockaddr_tipc topsrv;
+    int sd = socket(AF_TIPC, SOCK_SEQPACKET, 0);
+    if (sd == -EAFNOSUPPORT) {
+        return 1;
+    }
+    memset(&topsrv, 0, sizeof(topsrv));
+    topsrv.family = AF_TIPC;
+    topsrv.addrtype = TIPC_ADDR_NAME;
+    topsrv.addr.name.name.type = TIPC_TOP_SRV;
+    topsrv.addr.name.name.instance = TIPC_TOP_SRV;
+    fcntl(sd, F_SETFL, O_NONBLOCK);
+    if (connect(sd, (struct sockaddr *)&topsrv, sizeof(topsrv)) != 0) {
+        if (errno != EINPROGRESS)
+            return -1;
+    }
+}
+"
+    ZMQ_HAVE_TIPC)
+endmacro()
--- a/builds/cmake/ci_build.sh
+++ b/builds/cmake/ci_build.sh
@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+set -x
+
+mkdir tmp
+BUILD_PREFIX=$PWD/tmp
+
+CONFIG_OPTS=()
+CONFIG_OPTS+=("CFLAGS=-I${BUILD_PREFIX}/include")
+CONFIG_OPTS+=("CPPFLAGS=-I${BUILD_PREFIX}/include")
+CONFIG_OPTS+=("CXXFLAGS=-I${BUILD_PREFIX}/include")
+CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
+CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
+
+CMAKE_OPTS=()
+CMAKE_OPTS+=("-DCMAKE_INSTALL_PREFIX:PATH=${BUILD_PREFIX}")
+CMAKE_OPTS+=("-DCMAKE_PREFIX_PATH:PATH=${BUILD_PREFIX}")
+CMAKE_OPTS+=("-DCMAKE_LIBRARY_PATH:PATH=${BUILD_PREFIX}/lib")
+CMAKE_OPTS+=("-DCMAKE_INCLUDE_PATH:PATH=${BUILD_PREFIX}/include")
+
+if [ -z $CURVE ]; then
+    CMAKE_OPTS+=("-DENABLE_CURVE=OFF")
+elif [ $CURVE == "libsodium" ]; then
+    CMAKE_OPTS+=("-DWITH_LIBSODIUM=ON")
+
+    git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
+    ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
+fi
+
+# Build, check, and install from local source
+( cd ../..; mkdir build_cmake && cd build_cmake && PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig cmake "${CMAKE_OPTS[@]}" .. && make all VERBOSE=1 && make install && make test ) || exit 1
--- a/builds/cmake/platform.hpp.in
+++ b/builds/cmake/platform.hpp.in
@ -9,10 +9,10 @@

 #cmakedefine ZMQ_FORCE_MUTEXES

-
 #cmakedefine HAVE_FORK
 #cmakedefine HAVE_CLOCK_GETTIME
 #cmakedefine HAVE_GETHRTIME
+#cmakedefine HAVE_MKDTEMP
 #cmakedefine ZMQ_HAVE_UIO

 #cmakedefine ZMQ_HAVE_EVENTFD
@ -31,6 +31,9 @@
 #cmakedefine ZMQ_HAVE_OPENPGM
 #cmakedefine ZMQ_MAKE_VALGRIND_HAPPY

+#cmakedefine ZMQ_HAVE_CURVE
+#cmakedefine ZMQ_USE_TWEETNACL
+#cmakedefine HAVE_LIBSODIUM

 #ifdef _AIX
  #define ZMQ_HAVE_AIX
@ -86,4 +89,4 @@

 #cmakedefine ZMQ_HAVE_WINDOWS

-#endif
+#endif
--- a/builds/coverage/ci_build.sh
+++ b/builds/coverage/ci_build.sh
@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -x
+
+mkdir tmp
+BUILD_PREFIX=$PWD/tmp
+
+CONFIG_OPTS=()
+CONFIG_OPTS+=("CFLAGS=-I${BUILD_PREFIX}/include")
+CONFIG_OPTS+=("CPPFLAGS=-I${BUILD_PREFIX}/include")
+CONFIG_OPTS+=("CXXFLAGS=-I${BUILD_PREFIX}/include")
+CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
+CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
+CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
+CONFIG_OPTS+=("--enable-code-coverage")
+
+if [ -z $CURVE ]; then
+    CMAKE_OPTS+=("-DENABLE_CURVE=OFF")
+elif [ $CURVE == "libsodium" ]; then
+    CMAKE_OPTS+=("-DWITH_LIBSODIUM=ON")
+
+    git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
+    ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
+fi
+
+pip install --user cpp-coveralls
+
+# Build, check, and install from local source
+( cd ../..; ./autogen.sh && ./configure "${CONFIG_OPTS[@]}" && make -j5 && make check && coveralls --exclude tests --build-root . --gcov-options '\-lp') || exit 1
--- a/builds/cygwin/Makefile.cygwin
+++ b/builds/cygwin/Makefile.cygwin
@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS=-Wall -Os -g -DDLL_EXPORT -DFD_SETSIZE=4096 -DZMQ_USE_SELECT -I.
+CFLAGS=-Wall -Os -g -DDLL_EXPORT -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -I.
 LIBS=-lws2_32

 OBJS = ctx.o reaper.o dist.o err.o \
@ -18,6 +18,7 @@ OBJS = ctx.o reaper.o dist.o err.o \
 	pgm_socket.o pgm_receiver.o pgm_sender.o \
 	raw_decoder.o raw_encoder.o \
 	v1_decoder.o v1_encoder.o v2_decoder.o v2_encoder.o \
+        udp_address.o upd_engine.o radio.o dish.o \
 	socket_base.o session_base.o options.o \
 	req.o rep.o push.o pull.o pub.o sub.o pair.o \
 	dealer.o router.o xpub.o xsub.o stream.o \
--- a/builds/gyp/.gitignore
+++ b/builds/gyp/.gitignore
@ -0,0 +1,5 @@
+project.Makefile
+*.mk
+out/
+Makefile
+
--- a/builds/gyp/build.bat
+++ b/builds/gyp/build.bat
@ -0,0 +1,4 @@
+@echo off
+:-  Needs Visual Studio 2015
+"\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvars32.bat"
+msbuild /m /v:m project.sln
--- a/builds/gyp/platform.hpp
+++ b/builds/gyp/platform.hpp
@ -0,0 +1,78 @@
+/*
+    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
+
+    This file is part of libzmq, the ZeroMQ core engine in C++.
+
+    libzmq is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License (LGPL) as published
+    by the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    As a special exception, the Contributors give you permission to link
+    this library with independent modules to produce an executable,
+    regardless of the license terms of these independent modules, and to
+    copy and distribute the resulting executable under terms of your choice,
+    provided that you also meet, for each linked independent module, the
+    terms and conditions of the license of that module. An independent
+    module is a module which is not derived from or based on this library.
+    If you modify this library, you must extend this exception to your
+    version of the library.
+
+    libzmq is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+    License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __ZMQ_PLATFORM_HPP_INCLUDED__
+#define __ZMQ_PLATFORM_HPP_INCLUDED__
+
+//  This file provides the configuration for Linux, Windows, and OS/X
+//  as determined by ZMQ_HAVE_XXX macros passed from project.gyp
+
+//  Check that we're being called from our gyp makefile
+#ifndef ZMQ_GYP_BUILD
+#   error "foreign platform.hpp detected, please re-configure"
+#endif
+
+//  Set for all platforms
+#define ZMQ_HAVE_CURVE 1
+#define ZMQ_USE_TWEETNACL 1
+
+#if defined ZMQ_HAVE_WINDOWS
+#   define ZMQ_USE_SELECT 1
+
+#elif defined ZMQ_HAVE_OSX
+#   define ZMQ_USE_KQUEUE 1
+#   define HAVE_POSIX_MEMALIGN 1
+#   define ZMQ_HAVE_IFADDRS 1
+#   define ZMQ_HAVE_SO_KEEPALIVE 1
+#   define ZMQ_HAVE_TCP_KEEPALIVE 1
+#   define ZMQ_HAVE_TCP_KEEPCNT 1
+#   define ZMQ_HAVE_TCP_KEEPINTVL 1
+#   define ZMQ_HAVE_UIO 1
+#   define HAVE_FORK 1
+
+#elif defined ZMQ_HAVE_LINUX
+#   define ZMQ_USE_EPOLL 1
+#   define HAVE_POSIX_MEMALIGN 1
+#   define ZMQ_HAVE_EVENTFD 1
+#   define ZMQ_HAVE_IFADDRS 1
+#   define ZMQ_HAVE_SOCK_CLOEXEC 1
+#   define ZMQ_HAVE_SO_KEEPALIVE 1
+#   define ZMQ_HAVE_SO_PEERCRED 1
+#   define ZMQ_HAVE_TCP_KEEPCNT 1
+#   define ZMQ_HAVE_TCP_KEEPIDLE 1
+#   define ZMQ_HAVE_TCP_KEEPINTVL 1
+#   define ZMQ_HAVE_UIO 1
+#   define HAVE_CLOCK_GETTIME 1
+#   define HAVE_FORK 1
+
+#else
+#   error "No platform defined, abandoning"
+#endif
+
+#endif
--- a/builds/gyp/project-tests.gsl
+++ b/builds/gyp/project-tests.gsl
@ -0,0 +1,19 @@
+.echo "Generating project-tests.gypi..."
+.output "project-tests.gypi"
+{
+  'targets': [
+.for test
+    {
+      'target_name': '$(name)',
+      'type': 'executable',
+      'sources': [
+        '../../tests/$(name).cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    }$(last ()?? ""? ",")
+.endfor
+  ]
+}
--- a/builds/gyp/project-tests.gypi
+++ b/builds/gyp/project-tests.gypi
@ -0,0 +1,873 @@
+{
+  'targets': [
+    {
+      'target_name': 'test_system',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_system.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_pair_inproc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_pair_inproc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_pair_tcp',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_pair_tcp.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_reqrep_inproc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_reqrep_inproc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_reqrep_tcp',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_reqrep_tcp.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_hwm',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_hwm.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_hwm_pubsub',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_hwm_pubsub.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_reqrep_device',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_reqrep_device.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_sub_forward',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_sub_forward.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_invalid_rep',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_invalid_rep.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_msg_flags',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_msg_flags.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_msg_ffn',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_msg_ffn.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_connect_resolve',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_connect_resolve.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_immediate',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_immediate.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_last_endpoint',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_last_endpoint.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_term_endpoint',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_term_endpoint.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_srcfd',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_srcfd.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_monitor',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_monitor.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_router_mandatory',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_router_mandatory.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_router_mandatory_hwm',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_router_mandatory_hwm.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_router_handover',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_router_handover.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_probe_router',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_probe_router.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_stream',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_stream.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_stream_empty',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_stream_empty.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_stream_disconnect',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_stream_disconnect.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_stream_timeout',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_stream_timeout.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_disconnect_inproc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_disconnect_inproc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_unbind_inproc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_unbind_inproc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_unbind_wildcard',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_unbind_wildcard.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_ctx_options',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_ctx_options.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_ctx_destroy',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_ctx_destroy.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_security_null',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_security_null.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_security_plain',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_security_plain.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_security_curve',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_security_curve.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_iov',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_iov.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_spec_req',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_spec_req.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_spec_rep',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_spec_rep.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_spec_dealer',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_spec_dealer.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_spec_router',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_spec_router.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_spec_pushpull',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_spec_pushpull.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_req_correlate',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_req_correlate.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_req_relaxed',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_req_relaxed.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_conflate',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_conflate.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_inproc_connect',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_inproc_connect.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_issue_566',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_issue_566.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_proxy',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_proxy.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_proxy_single_socket',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_proxy_single_socket.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_proxy_terminate',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_proxy_terminate.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_getsockopt_memset',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_getsockopt_memset.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_setsockopt',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_setsockopt.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_many_sockets',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_many_sockets.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_ipc_wildcard',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_ipc_wildcard.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_diffserv',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_diffserv.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_connect_rid',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_connect_rid.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_bind_src_address',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_bind_src_address.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_metadata',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_metadata.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_capabilities',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_capabilities.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_xpub_nodrop',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_xpub_nodrop.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_xpub_manual',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_xpub_manual.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_xpub_welcome_msg',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_xpub_welcome_msg.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_atomics',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_atomics.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_client_server',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_client_server.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_thread_safe',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_thread_safe.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_sockopt_hwm',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_sockopt_hwm.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_heartbeats',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_heartbeats.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_stream_exceeds_buffer',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_stream_exceeds_buffer.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_poller',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_poller.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_timers',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_timers.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_radio_dish',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_radio_dish.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_udp',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_udp.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_shutdown_stress',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_shutdown_stress.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_pair_ipc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_pair_ipc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_reqrep_ipc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_reqrep_ipc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_use_fd_ipc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_use_fd_ipc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_use_fd_tcp',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_use_fd_tcp.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_timeo',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_timeo.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_filter_ipc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_filter_ipc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_fork',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_fork.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    },
+    {
+      'target_name': 'test_abstract_ipc',
+      'type': 'executable',
+      'sources': [
+        '../../tests/test_abstract_ipc.cpp',
+        '../../tests/testutil.hpp'
+      ],
+      'dependencies': [
+        'libzmq'
+      ],
+    }
+  ]
+}
--- a/builds/gyp/project-tests.xml
+++ b/builds/gyp/project-tests.xml
@ -0,0 +1,81 @@
+<tests script = "project-tests">
+    <test name = "test_system" />
+    <test name = "test_pair_inproc" />
+    <test name = "test_pair_tcp" />
+    <test name = "test_reqrep_inproc" />
+    <test name = "test_reqrep_tcp" />
+    <test name = "test_hwm" />
+    <test name = "test_hwm_pubsub" />
+    <test name = "test_reqrep_device" />
+    <test name = "test_sub_forward" />
+    <test name = "test_invalid_rep" />
+    <test name = "test_msg_flags" />
+    <test name = "test_msg_ffn" />
+    <test name = "test_connect_resolve" />
+    <test name = "test_immediate" />
+    <test name = "test_last_endpoint" />
+    <test name = "test_term_endpoint" />
+    <test name = "test_srcfd" />
+    <test name = "test_monitor" />
+    <test name = "test_router_mandatory" />
+    <test name = "test_router_mandatory_hwm" />
+    <test name = "test_router_handover" />
+    <test name = "test_probe_router" />
+    <test name = "test_stream" />
+    <test name = "test_stream_empty" />
+    <test name = "test_stream_disconnect" />
+    <test name = "test_stream_timeout" />
+    <test name = "test_disconnect_inproc" />
+    <test name = "test_unbind_inproc" />
+    <test name = "test_unbind_wildcard" />
+    <test name = "test_ctx_options" />
+    <test name = "test_ctx_destroy" />
+    <test name = "test_security_null" />
+    <test name = "test_security_plain" />
+    <test name = "test_security_curve" />
+    <test name = "test_iov" />
+    <test name = "test_spec_req" />
+    <test name = "test_spec_rep" />
+    <test name = "test_spec_dealer" />
+    <test name = "test_spec_router" />
+    <test name = "test_spec_pushpull" />
+    <test name = "test_req_correlate" />
+    <test name = "test_req_relaxed" />
+    <test name = "test_conflate" />
+    <test name = "test_inproc_connect" />
+    <test name = "test_issue_566" />
+    <test name = "test_proxy" />
+    <test name = "test_proxy_single_socket" />
+    <test name = "test_proxy_terminate" />
+    <test name = "test_getsockopt_memset" />
+    <test name = "test_setsockopt" />
+    <test name = "test_many_sockets" />
+    <test name = "test_ipc_wildcard" />
+    <test name = "test_diffserv" />
+    <test name = "test_connect_rid" />
+    <test name = "test_bind_src_address" />
+    <test name = "test_metadata" />
+    <test name = "test_capabilities" />
+    <test name = "test_xpub_nodrop" />
+    <test name = "test_xpub_manual" />
+    <test name = "test_xpub_welcome_msg" />
+    <test name = "test_atomics" />
+    <test name = "test_client_server" />
+    <test name = "test_thread_safe" />
+    <test name = "test_sockopt_hwm" />
+    <test name = "test_heartbeats" />
+    <test name = "test_stream_exceeds_buffer" />
+    <test name = "test_poller" />
+    <test name = "test_timers" />
+    <test name = "test_radio_dish" />
+    <test name = "test_udp" />
+    <test name = "test_shutdown_stress" />
+    <test name = "test_pair_ipc" />
+    <test name = "test_reqrep_ipc" />
+    <test name = "test_use_fd_ipc" />
+    <test name = "test_use_fd_tcp" />
+    <test name = "test_timeo" />
+    <test name = "test_filter_ipc" />
+    <test name = "test_fork" />
+    <test name = "test_abstract_ipc" />
+</tests>
--- a/builds/gyp/project.gyp
+++ b/builds/gyp/project.gyp
@ -0,0 +1,288 @@
+#
+#   This is the gyp script for libzmq
+#
+#   Run in builds/gyp, as follows:
+#
+#       gyp --depth=. --format=make
+#       make
+{
+  'includes': [
+    'project-tests.gypi',
+  ],
+  'target_defaults': {
+    'include_dirs': [
+      '../../include',
+      '.'
+    ],
+    'defines': [
+      '_REENTRANT',
+      '_THREAD_SAFE',
+      'ZMQ_CUSTOM_PLATFORM_HPP',
+      'ZMQ_GYP_BUILD'
+    ],
+    'conditions': [
+      [ 'OS=="win"', {
+        'defines': [
+          'ZMQ_HAVE_WINDOWS',
+          'ZMQ_STATIC',
+          'FD_SETSIZE=16384',
+          '_CRT_SECURE_NO_WARNINGS',
+          '_WINSOCK_DEPRECATED_NO_WARNINGS'
+        ],
+        'libraries': [
+          'ws2_32',
+          'advapi32',
+          'iphlpapi'
+        ]
+      }],
+      [ 'OS=="mac"', {
+        'defines': [
+          'ZMQ_HAVE_OSX'
+        ],
+        'xcode_settings': {
+          'GCC_ENABLE_CPP_RTTI': 'YES'
+        }
+      }],
+      [ 'OS=="linux"', {
+        'defines': [
+          'ZMQ_HAVE_LINUX'
+        ],
+        'cflags_cc!': [
+          '-fno-rtti'
+        ],
+        'libraries': [
+          '-lpthread'
+        ]
+      }]
+    ]
+  },
+  'targets': [
+    {
+      'target_name': 'libzmq',
+      'type': 'static_library',
+      'sources': [
+        'platform.hpp',
+        '../../include/zmq.h',
+        '../../src/address.cpp',
+        '../../src/address.hpp',
+        '../../src/array.hpp',
+        '../../src/atomic_counter.hpp',
+        '../../src/atomic_ptr.hpp',
+        '../../src/blob.hpp',
+        '../../src/client.cpp',
+        '../../src/client.hpp',
+        '../../src/clock.cpp',
+        '../../src/clock.hpp',
+        '../../src/command.hpp',
+        '../../src/condition_variable.hpp',
+        '../../src/config.hpp',
+        '../../src/ctx.cpp',
+        '../../src/ctx.hpp',
+        '../../src/curve_client.cpp',
+        '../../src/curve_client.hpp',
+        '../../src/curve_server.cpp',
+        '../../src/curve_server.hpp',
+        '../../src/dbuffer.hpp',
+        '../../src/dealer.cpp',
+        '../../src/dealer.hpp',
+        '../../src/decoder.hpp',
+        '../../src/decoder_allocators.cpp',
+        '../../src/decoder_allocators.hpp',
+        '../../src/devpoll.cpp',
+        '../../src/devpoll.hpp',
+        '../../src/dish.cpp',
+        '../../src/dish.hpp',
+        '../../src/dist.cpp',
+        '../../src/dist.hpp',
+        '../../src/encoder.hpp',
+        '../../src/epoll.cpp',
+        '../../src/epoll.hpp',
+        '../../src/err.cpp',
+        '../../src/err.hpp',
+        '../../src/fd.hpp',
+        '../../src/fq.cpp',
+        '../../src/fq.hpp',
+        '../../src/gssapi_client.cpp',
+        '../../src/gssapi_client.hpp',
+        '../../src/gssapi_mechanism_base.cpp',
+        '../../src/gssapi_mechanism_base.hpp',
+        '../../src/gssapi_server.cpp',
+        '../../src/gssapi_server.hpp',
+        '../../src/i_decoder.hpp',
+        '../../src/i_encoder.hpp',
+        '../../src/i_engine.hpp',
+        '../../src/i_mailbox.hpp',
+        '../../src/i_poll_events.hpp',
+        '../../src/io_object.cpp',
+        '../../src/io_object.hpp',
+        '../../src/io_thread.cpp',
+        '../../src/io_thread.hpp',
+        '../../src/ip.cpp',
+        '../../src/ip.hpp',
+        '../../src/ipc_address.cpp',
+        '../../src/ipc_address.hpp',
+        '../../src/ipc_connecter.cpp',
+        '../../src/ipc_connecter.hpp',
+        '../../src/ipc_listener.cpp',
+        '../../src/ipc_listener.hpp',
+        '../../src/kqueue.cpp',
+        '../../src/kqueue.hpp',
+        '../../src/lb.cpp',
+        '../../src/lb.hpp',
+        '../../src/likely.hpp',
+        '../../src/mailbox.cpp',
+        '../../src/mailbox.hpp',
+        '../../src/mailbox_safe.cpp',
+        '../../src/mailbox_safe.hpp',
+        '../../src/mechanism.cpp',
+        '../../src/mechanism.hpp ',
+        '../../src/metadata.cpp',
+        '../../src/metadata.hpp',
+        '../../src/msg.cpp',
+        '../../src/msg.hpp',
+        '../../src/mtrie.cpp',
+        '../../src/mtrie.hpp',
+        '../../src/mutex.hpp',
+        '../../src/norm_engine.cpp',
+        '../../src/norm_engine.hpp',
+        '../../src/null_mechanism.cpp',
+        '../../src/null_mechanism.hpp',
+        '../../src/object.cpp',
+        '../../src/object.hpp',
+        '../../src/options.cpp',
+        '../../src/options.hpp',
+        '../../src/own.cpp',
+        '../../src/own.hpp',
+        '../../src/pair.cpp',
+        '../../src/pair.hpp',
+        '../../src/pgm_receiver.cpp',
+        '../../src/pgm_receiver.hpp',
+        '../../src/pgm_sender.cpp',
+        '../../src/pgm_sender.hpp',
+        '../../src/pgm_socket.cpp',
+        '../../src/pgm_socket.hpp',
+        '../../src/pipe.cpp',
+        '../../src/pipe.hpp',
+        '../../src/plain_client.cpp',
+        '../../src/plain_client.hpp',
+        '../../src/plain_server.cpp',
+        '../../src/plain_server.hpp',
+        '../../src/poll.cpp',
+        '../../src/poll.hpp',
+        '../../src/poller.hpp',
+        '../../src/poller_base.cpp',
+        '../../src/poller_base.hpp',
+        '../../src/proxy.cpp',
+        '../../src/proxy.hpp',
+        '../../src/pub.cpp',
+        '../../src/pub.hpp',
+        '../../src/pull.cpp',
+        '../../src/pull.hpp',
+        '../../src/push.cpp',
+        '../../src/push.hpp',
+        '../../src/radio.cpp',
+        '../../src/radio.hpp',
+        '../../src/random.cpp',
+        '../../src/random.hpp',
+        '../../src/raw_decoder.cpp',
+        '../../src/raw_decoder.hpp',
+        '../../src/raw_encoder.cpp',
+        '../../src/raw_encoder.hpp',
+        '../../src/reaper.cpp',
+        '../../src/reaper.hpp',
+        '../../src/rep.cpp',
+        '../../src/rep.hpp',
+        '../../src/req.cpp',
+        '../../src/req.hpp',
+        '../../src/router.cpp',
+        '../../src/router.hpp',
+        '../../src/select.cpp',
+        '../../src/select.hpp',
+        '../../src/server.cpp',
+        '../../src/server.hpp',
+        '../../src/session_base.cpp',
+        '../../src/session_base.hpp',
+        '../../src/signaler.cpp',
+        '../../src/signaler.hpp',
+        '../../src/socket_base.cpp',
+        '../../src/socket_base.hpp',
+        '../../src/socket_poller.cpp',
+        '../../src/socket_poller.hpp',
+        '../../src/socks.cpp',
+        '../../src/socks.hpp',
+        '../../src/socks_connecter.cpp',
+        '../../src/socks_connecter.hpp',
+        '../../src/stdint.hpp',
+        '../../src/stream.cpp',
+        '../../src/stream.hpp',
+        '../../src/stream_engine.cpp',
+        '../../src/stream_engine.hpp',
+        '../../src/sub.cpp',
+        '../../src/sub.hpp',
+        '../../src/tcp.cpp',
+        '../../src/tcp.hpp',
+        '../../src/tcp_address.cpp',
+        '../../src/tcp_address.hpp',
+        '../../src/tcp_connecter.cpp',
+        '../../src/tcp_connecter.hpp',
+        '../../src/tcp_listener.cpp',
+        '../../src/tcp_listener.hpp',
+        '../../src/thread.cpp',
+        '../../src/thread.hpp',
+        '../../src/timers.cpp',
+        '../../src/timers.hpp',
+        '../../src/tipc_address.cpp',
+        '../../src/tipc_address.hpp',
+        '../../src/tipc_connecter.cpp',
+        '../../src/tipc_connecter.hpp',
+        '../../src/tipc_listener.cpp',
+        '../../src/tipc_listener.hpp',
+        '../../src/trie.cpp',
+        '../../src/trie.hpp',
+        '../../src/tweetnacl.c',
+        '../../src/tweetnacl.h',
+        '../../src/udp_address.cpp',
+        '../../src/udp_address.hpp',
+        '../../src/udp_engine.cpp',
+        '../../src/udp_engine.hpp',
+        '../../src/v1_decoder.cpp',
+        '../../src/v1_decoder.hpp',
+        '../../src/v1_encoder.cpp',
+        '../../src/v1_encoder.hpp',
+        '../../src/v2_decoder.cpp',
+        '../../src/v2_decoder.hpp',
+        '../../src/v2_encoder.cpp',
+        '../../src/v2_encoder.hpp',
+        '../../src/v2_protocol.hpp',
+        '../../src/vmci.cpp',
+        '../../src/vmci.hpp',
+        '../../src/vmci_address.cpp',
+        '../../src/vmci_address.hpp',
+        '../../src/vmci_connecter.cpp',
+        '../../src/vmci_connecter.hpp',
+        '../../src/vmci_listener.cpp',
+        '../../src/vmci_listener.hpp',
+        '../../src/windows.hpp',
+        '../../src/wire.hpp',
+        '../../src/xpub.cpp',
+        '../../src/xpub.hpp',
+        '../../src/xsub.cpp',
+        '../../src/xsub.hpp',
+        '../../src/ypipe.hpp',
+        '../../src/ypipe_base.hpp',
+        '../../src/ypipe_conflate.hpp',
+        '../../src/yqueue.hpp',
+        '../../src/zmq.cpp',
+        '../../src/zmq_utils.cpp'
+      ],
+      'copies': [
+        {
+          'destination': '../../src',
+          'files': [
+              'platform.hpp'
+          ]
+        }
+      ]
+    }
+  ]
+}
--- a/builds/mingw32/Makefile.mingw32
+++ b/builds/mingw32/Makefile.mingw32
@ -1,6 +1,6 @@
 CC=gcc
-CFLAGS=-Wall -Os -g -DDLL_EXPORT -DFD_SETSIZE=4096 -DZMQ_USE_SELECT -I.
-LIBS=-lws2_32
+CFLAGS=-Wall -Os -g -DDLL_EXPORT -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -I.
+LIBS=-lws2_32 -lIphlpapi

 OBJS = ctx.o reaper.o dist.o err.o \
 	clock.o metadata.o random.o \
@ -18,12 +18,15 @@ OBJS = ctx.o reaper.o dist.o err.o \
 	pgm_socket.o pgm_receiver.o pgm_sender.o \
 	raw_decoder.o raw_encoder.o \
 	v1_decoder.o v1_encoder.o v2_decoder.o v2_encoder.o \
+        udp_address.o udp_engine.o radio.o dish.o \
 	socket_base.o session_base.o options.o \
 	req.o rep.o push.o pull.o pub.o sub.o pair.o \
 	dealer.o router.o xpub.o xsub.o stream.o \
 	poller_base.o select.o poll.o epoll.o kqueue.o devpoll.o \
 	curve_client.o curve_server.o \
 	mechanism.o null_mechanism.o plain_client.o plain_server.o \
+	socks.o server.o decoder_allocators.o socks_connecter.o \
+	socket_poller.o mailbox_safe.o plain_server.o client.o timers.o \
 	zmq.o zmq_utils.o

 %.o: ../../src/%.cpp
@ -44,4 +47,3 @@ libzmq.dll: $(OBJS)

 clean:
 	del *.o *.a *.dll *.exe
-	
--- a/builds/mingw32/platform.hpp
+++ b/builds/mingw32/platform.hpp
@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2007-2015 Contributors as noted in the AUTHORS file
+    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file

    This file is part of libzmq, the ZeroMQ core engine in C++.

--- a/builds/msvc/.gitignore
+++ b/builds/msvc/.gitignore
@ -0,0 +1,256 @@
+## Visual Studio 2015 experimental Visual C/C++ Intellisense database
+*.VC.db
+
+
+## From https://github.com/github/gitignore
+##
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
--- a/builds/msvc/Makefile.am
+++ b/builds/msvc/Makefile.am
@ -3,31 +3,24 @@ LIBZMQ_DIST = vs2008/libzmq.sln \
              vs2010/libzmq.sln \
              vs2010/libzmq/libzmq.vcxproj \
              vs2010/libzmq/libzmq.vcxproj.filters \
-              vs2010/libzmq/libzmq.props \
-              vs2010/libzmq/libzmq.xml \
-              vs2010/libzmq.import.props \
-              vs2010/libzmq.import.xml \
-              vs2010/libsodium.import.props \
-              vs2010/libsodium.import.xml \
              vs2012/libzmq.sln \
              vs2012/libzmq/libzmq.vcxproj \
              vs2012/libzmq/libzmq.vcxproj.filters \
-              vs2012/libzmq/libzmq.props \
-              vs2012/libzmq/libzmq.xml \
-              vs2012/libzmq.import.props \
-              vs2012/libzmq.import.xml \
-              vs2012/libsodium.import.props \
-              vs2012/libsodium.import.xml \
              vs2013/libzmq.sln \
              vs2013/libzmq/libzmq.vcxproj \
              vs2013/libzmq/libzmq.vcxproj.filters \
-              vs2013/libzmq/libzmq.props \
-              vs2013/libzmq/libzmq.xml \
-              vs2013/libzmq.import.props \
-              vs2013/libzmq.import.xml \
-              vs2013/libsodium.import.props \
-              vs2013/libsodium.import.xml \
-              platform.hpp errno.cpp errno.hpp resource.h resource.rc
+              vs2015/libzmq.sln \
+              vs2015/libzmq/libzmq.vcxproj \
+              vs2015/libzmq/libzmq.vcxproj.filters \
+              vs2015/libzmq/libzmq.props \
+              vs2015/libzmq/libzmq.xml \
+              vs2015/libzmq.import.props \
+              vs2015/libzmq.import.xml \
+              errno.cpp \
+              errno.hpp \
+              platform.hpp \
+              resource.h \
+              resource.rc

 PERF_DIST = vs2008/local_lat/local_lat.vcproj \
            vs2008/local_thr/local_thr.vcproj \
@ -41,63 +34,61 @@ PERF_DIST = vs2008/local_lat/local_lat.vcproj \
            vs2010/remote_thr/remote_thr.vcxproj \
            vs2010/inproc_lat/inproc_lat.vcxproj \
            vs2010/inproc_thr/inproc_thr.vcxproj \
-            vs2010/local_lat/local_lat.props \
-            vs2010/local_thr/local_thr.props \
-            vs2010/remote_lat/remote_lat.props \
-            vs2010/remote_thr/remote_thr.props \
-            vs2010/inproc_lat/inproc_lat.props \
-            vs2010/inproc_thr/inproc_thr.props \
            vs2012/local_lat/local_lat.vcxproj \
            vs2012/local_thr/local_thr.vcxproj \
            vs2012/remote_lat/remote_lat.vcxproj \
            vs2012/remote_thr/remote_thr.vcxproj \
            vs2012/inproc_lat/inproc_lat.vcxproj \
            vs2012/inproc_thr/inproc_thr.vcxproj \
-            vs2012/local_lat/local_lat.props \
-            vs2012/local_thr/local_thr.props \
-            vs2012/remote_lat/remote_lat.props \
-            vs2012/remote_thr/remote_thr.props \
-            vs2012/inproc_lat/inproc_lat.props \
-            vs2012/inproc_thr/inproc_thr.props \
            vs2013/local_lat/local_lat.vcxproj \
            vs2013/local_thr/local_thr.vcxproj \
            vs2013/remote_lat/remote_lat.vcxproj \
            vs2013/remote_thr/remote_thr.vcxproj \
            vs2013/inproc_lat/inproc_lat.vcxproj \
            vs2013/inproc_thr/inproc_thr.vcxproj \
-            vs2013/local_lat/local_lat.props \
-            vs2013/local_thr/local_thr.props \
-            vs2013/remote_lat/remote_lat.props \
-            vs2013/remote_thr/remote_thr.props \
-            vs2013/inproc_lat/inproc_lat.props \
-            vs2013/inproc_thr/inproc_thr.props
+            vs2015/local_lat/local_lat.vcxproj \
+            vs2015/local_lat/local_lat.props \
+            vs2015/local_thr/local_thr.vcxproj \
+            vs2015/local_thr/local_thr.props \
+            vs2015/remote_lat/remote_lat.vcxproj \
+            vs2015/remote_lat/remote_lat.props \
+            vs2015/remote_thr/remote_thr.vcxproj \
+            vs2015/remote_thr/remote_thr.props \
+            vs2015/inproc_lat/inproc_lat.vcxproj \
+            vs2015/inproc_lat/inproc_lat.props \
+            vs2015/inproc_thr/inproc_thr.vcxproj \
+            vs2015/inproc_thr/inproc_thr.props

 PROPERTIES_DIST = properties/Common.props \
-		  properties/DebugDEXE.props \
-		  properties/DebugDLL.props \
-		  properties/DebugLEXE.props \
-		  properties/DebugLIB.props \
-		  properties/DebugLTCG.props \
-		  properties/Debug.props \
-		  properties/DebugSEXE.props \
-		  properties/DLL.props \
-		  properties/EXE.props \
-		  properties/LIB.props \
-		  properties/Link.props \
-		  properties/LTCG.props \
-		  properties/Messages.props \
-		  properties/Output.props \
-		  properties/ReleaseDEXE.props \
-		  properties/ReleaseDLL.props \
-		  properties/ReleaseLEXE.props \
-		  properties/ReleaseLIB.props \
-		  properties/ReleaseLTCG.props \
-		  properties/Release.props \
-		  properties/ReleaseSEXE.props \
-		  properties/Win32.props \
-		  properties/x64.props
+                  properties/Debug.props \
+                  properties/DebugDEXE.props \
+                  properties/DebugDLL.props \
+                  properties/DebugLEXE.props \
+                  properties/DebugLIB.props \
+                  properties/DebugLTCG.props \
+                  properties/DebugSEXE.props \
+                  properties/DLL.props \
+                  properties/EXE.props \
+                  properties/LIB.props \
+                  properties/Link.props \
+                  properties/LTCG.props \
+                  properties/Messages.props \
+                  properties/Output.props \
+                  properties/Release.props \
+                  properties/ReleaseDEXE.props \
+                  properties/ReleaseDLL.props \
+                  properties/ReleaseLEXE.props \
+                  properties/ReleaseLIB.props \
+                  properties/ReleaseLTCG.props \
+                  properties/ReleaseSEXE.props \
+                  properties/Win32.props \
+                  properties/x64.props

 PRECOMPILED_DIST = ../../src/precompiled.hpp \
                   ../../src/precompiled.cpp

-EXTRA_DIST = $(LIBZMQ_DIST) $(PERF_DIST) $(PROPERTIES_DIST) $(PRECOMPILED_DIST)
+BUILD_DIST = build/build.bat \
+             build/buildall.bat \
+             build/buildbase.bat
+
+EXTRA_DIST = $(LIBZMQ_DIST) $(PERF_DIST) $(PROPERTIES_DIST) $(PRECOMPILED_DIST) $(BUILD_DIST)
--- a/builds/msvc/build/build.bat
+++ b/builds/msvc/build/build.bat
@ -0,0 +1,33 @@
+@ECHO OFF
+:: Usage: build.bat [Clean]
+@setlocal
+
+:: validate environment
+if "%VSINSTALLDIR%" == "" @echo Error: Attempt to build without proper DevStudio environment.&@goto :done
+
+:: record starting time
+set STARTTIME=%DATE% %TIME%
+@echo Start Time: %STARTTIME%
+
+
+:: validate optional argument (and make sure it is spelled "Clean")
+set MAKECLEAN=%%1
+if NOT "%%1" == "" if /I "%%1" == "clean" set MAKECLEAN=Clean
+
+
+::
+:: uses the environment from the DevStudio CMD window to figure out which version to build
+::
+
+set VSVER=%VSINSTALLDIR:~-5,2%
+set DIRVER=%VSVER%
+if %VSVER% gtr 10 set /a DIRVER = DIRVER + 1
+
+CALL buildbase.bat ..\vs20%DIRVER%\libzmq.sln %VSVER% %MAKECLEAN%
+
+set STOPTIME=%DATE% %TIME%
+@echo Stop  Time: %STOPTIME%
+@echo Start Time: %STARTTIME%
+
+:done
+@endlocal
--- a/builds/msvc/build/buildall.bat
+++ b/builds/msvc/build/buildall.bat
@ -1,5 +1,9 @@
@ECHO OFF
+:: Usage: buildall.bat

+:: Build all configurations for all solutions.
+CALL buildbase.bat ..\vs2015\libzmq.sln 14
+ECHO.
 CALL buildbase.bat ..\vs2013\libzmq.sln 12
 ECHO.
 CALL buildbase.bat ..\vs2012\libzmq.sln 11
@ -7,4 +11,4 @@ ECHO.
 CALL buildbase.bat ..\vs2010\libzmq.sln 10
 ECHO.

-PAUSE
+PAUSE
--- a/builds/msvc/build/buildbase.bat
+++ b/builds/msvc/build/buildbase.bat
@ -1,61 +1,56 @@
@ECHO OFF
-REM Usage: [buildbase.bat ..\vs2013\mysolution.sln 12]
+@setlocal
+REM Usage: [buildbase.bat ..\vs2013\mysolution.sln 12 [Clean]]

 SET solution=%1
 SET version=%2
+
+:: supports passing in Clean as third argument if "make clean" behavior is desired
+SET target=%3
+SET ACTION=Building
+if NOT "%target%" == "" set target=/t:%target%&set ACTION=Cleaning
+
 SET log=build_%version%.log
 SET tools=Microsoft Visual Studio %version%.0\VC\vcvarsall.bat
 SET environment="%programfiles(x86)%\%tools%"
 IF NOT EXIST %environment% SET environment="%programfiles%\%tools%"
 IF NOT EXIST %environment% GOTO no_tools

-ECHO Building: %solution%
+@ECHO %ACTION% %solution%

-CALL %environment% x86 > nul
-ECHO Platform=x86
+CALL %environment% x86 >%SystemDrive%\nul 2>&1
+ECHO Platform=x86 2> %log%

 ECHO Configuration=DynDebug
-msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=Win32 %solution% > %log%
-IF errorlevel 1 GOTO error
+msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
 ECHO Configuration=DynRelease
-msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=Win32 %solution% >> %log%
-IF errorlevel 1 GOTO error
+msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
 ECHO Configuration=LtcgDebug
-msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=Win32 %solution% >> %log%
-IF errorlevel 1 GOTO error
+msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
 ECHO Configuration=LtcgRelease
-msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=Win32 %solution% >> %log%
-IF errorlevel 1 GOTO error
+msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
 ECHO Configuration=StaticDebug
-msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=Win32 %solution% >> %log%
-IF errorlevel 1 GOTO error
+msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
 ECHO Configuration=StaticRelease
-msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=Win32 %solution% >> %log%
-IF errorlevel 1 GOTO error
+msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=Win32 %solution% %target%>> %log% || GOTO error

-CALL %environment% x86_amd64 > nul
+CALL %environment% x86_amd64 >%SystemDrive%\nul 2>&1
 ECHO Platform=x64

 ECHO Configuration=DynDebug
-msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=x64 %solution% > %log%
-IF errorlevel 1 GOTO error
+msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=x64 %solution% %target%>> %log% || GOTO error
 ECHO Configuration=DynRelease
-msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=x64 %solution% >> %log%
-IF errorlevel 1 GOTO error
+msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=x64 %solution% %target%>> %log% || GOTO error
 ECHO Configuration=LtcgDebug
-msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=x64 %solution% >> %log%
-IF errorlevel 1 GOTO error
+msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=x64 %solution% %target%>> %log% || GOTO error
 ECHO Configuration=LtcgRelease
-msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=x64 %solution% >> %log%
-IF errorlevel 1 GOTO error
+msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=x64 %solution% %target%>> %log% || GOTO error
 ECHO Configuration=StaticDebug
-msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=x64 %solution% >> %log%
-IF errorlevel 1 GOTO error
+msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=x64 %solution% %target%>> %log% || GOTO error
 ECHO Configuration=StaticRelease
-msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=x64 %solution% >> %log%
-IF errorlevel 1 GOTO error
+msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=x64 %solution% %target%>> %log% || GOTO error

-ECHO Complete: %solution%
+ECHO %ACTION% complete: %solution%
 GOTO end

 :error
@ -66,4 +61,4 @@ GOTO end
 ECHO *** ERROR, build tools not found: %tools%

 :end
-
+@endlocal
--- a/builds/msvc/platform.hpp
+++ b/builds/msvc/platform.hpp
@ -1,41 +1,14 @@
-/*
-    Copyright (c) 2007-2015 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PLATFORM_HPP_INCLUDED__
-#define __ZMQ_PLATFORM_HPP_INCLUDED__
-
-//  This is the platform definition for the MSVC platform.
-//  As a first step of the build process it is copied to
-//  zmq directory to take place of platform.hpp generated from
-//  platform.hpp.in on platforms supported by GNU autotools.
-//  Place any MSVC-specific definitions here.
+#ifndef __PLATFORM_HPP_INCLUDED__
+#define __PLATFORM_HPP_INCLUDED__

 #define ZMQ_HAVE_WINDOWS

+// MSVC build configuration is controlled via options exposed in the Visual
+// Studio user interface. The option to use libsodium is not exposed in the
+// user interface unless a sibling `libsodium` directory to that of this
+// repository exists and contains the following files:
+//
+// \builds\msvc\vs2015\libsodium.import.props
+// \builds\msvc\vs2015\libsodium.import.xml
+
 #endif
--- a/builds/msvc/readme.txt
+++ b/builds/msvc/readme.txt
@ -1,3 +1,10 @@
+For building on Windows, use:
+
+     cd build
+     ./build.bat
+
+This requires that the CMD.EXE be created using the DevStudio Tools link to create a CMD.EXE window.
+
 Visual Studio product and C++ compiler Versions:

 Visual C++ 2008 => Visual C++ 9
@ -13,3 +20,7 @@ The vs2015/vs2013/vs2012/vs2010 solution and project files differ only in versio
 More info here:

 http://en.wikipedia.org/wiki/Visual_C%2B%2B
+
+If multiple DevStudio versions are installed, you can run build.bat in separate windows each created by the desired DevStudio target.
+
+To build for all versions of Visual Studio (excluding vs2008), you can run buildall.bat. This is generally a maintainer task.
--- a/builds/msvc/resource.rc
+++ b/builds/msvc/resource.rc
--- a/builds/msvc/vs2008/libzmq/libzmq.vcproj
+++ b/builds/msvc/vs2008/libzmq/libzmq.vcproj
@ -11,11 +11,11 @@
      <Tool Name="VCXMLDataGeneratorTool" />
      <Tool Name="VCWebServiceProxyGeneratorTool" />
      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DDLL_EXPORT -DFD_SETSIZE=4096 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="0" PreprocessorDefinitions="NOMINMAX" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
+      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DDLL_EXPORT -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="0" PreprocessorDefinitions="NOMINMAX" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib" OutputFile="../../../../lib/libzmq.dll" LinkDLL="true" GenerateDebugInformation="true" TargetMachine="1" />
+      <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib Iphlpapi.lib" OutputFile="../../../../lib/libzmq.dll" LinkDLL="true" GenerateDebugInformation="true" TargetMachine="1" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCManifestTool" />
      <Tool Name="VCXDCMakeTool" />
@ -30,11 +30,11 @@
      <Tool Name="VCXMLDataGeneratorTool" />
      <Tool Name="VCWebServiceProxyGeneratorTool" />
      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DDLL_EXPORT -DFD_SETSIZE=4096 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="2" EnableIntrinsicFunctions="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
+      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DDLL_EXPORT -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="2" EnableIntrinsicFunctions="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib" OutputFile="../../../../lib/libzmq.dll" LinkDLL="true" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
+      <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib Iphlpapi.lib" OutputFile="../../../../lib/libzmq.dll" LinkDLL="true" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCManifestTool" />
      <Tool Name="VCXDCMakeTool" />
@ -49,11 +49,11 @@
      <Tool Name="VCXMLDataGeneratorTool" />
      <Tool Name="VCWebServiceProxyGeneratorTool" />
      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DZMQ_STATIC -DFD_SETSIZE=4096 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="0" PreprocessorDefinitions="NOMINMAX" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
+      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DZMQ_STATIC -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="0" PreprocessorDefinitions="NOMINMAX" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" AdditionalOptions="/ignore:4006" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib" OutputFile="../../../../lib/libzmq_d.lib" />
+      <Tool Name="VCLibrarianTool" AdditionalOptions="/ignore:4006" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib Iphlpapi.lib" OutputFile="../../../../lib/libzmq_d.lib" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -66,11 +66,11 @@
      <Tool Name="VCXMLDataGeneratorTool" />
      <Tool Name="VCWebServiceProxyGeneratorTool" />
      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DZMQ_STATIC -DFD_SETSIZE=4096 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="2" EnableIntrinsicFunctions="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
+      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DZMQ_STATIC -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="2" EnableIntrinsicFunctions="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" AdditionalOptions="/ignore:4006" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib" OutputFile="../../../../lib/libzmq.lib" />
+      <Tool Name="VCLibrarianTool" AdditionalOptions="/ignore:4006" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib Iphlpapi.lib" OutputFile="../../../../lib/libzmq.lib" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCXDCMakeTool" />
      <Tool Name="VCBscMakeTool" />
@ -83,11 +83,11 @@
      <Tool Name="VCXMLDataGeneratorTool" />
      <Tool Name="VCWebServiceProxyGeneratorTool" />
      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DDLL_EXPORT -DFD_SETSIZE=4096 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../../../OpenPGM/include" PreprocessorDefinitions="ZMQ_HAVE_OPENPGM" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
+      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DDLL_EXPORT -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../../../OpenPGM/include" PreprocessorDefinitions="ZMQ_HAVE_OPENPGM" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
      <Tool Name="VCManagedResourceCompilerTool" />
      <Tool Name="VCResourceCompilerTool" />
      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib libpgm.lib" OutputFile="../../../../lib/libzmq.dll" AdditionalLibraryDirectories="../../../../../OpenPGM/lib" LinkDLL="true" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
+      <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib Iphlpapi.lib libpgm.lib" OutputFile="../../../../lib/libzmq.dll" AdditionalLibraryDirectories="../../../../../OpenPGM/lib" LinkDLL="true" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
      <Tool Name="VCALinkTool" />
      <Tool Name="VCManifestTool" />
      <Tool Name="VCXDCMakeTool" />
@ -100,15 +100,17 @@
  <References />
  <Files>
    <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+      <File RelativePath="..\..\errno.cpp" />
      <File RelativePath="..\..\..\..\src\address.cpp" />
      <File RelativePath="..\..\..\..\src\clock.cpp" />
      <File RelativePath="..\..\..\..\src\ctx.cpp" />
      <File RelativePath="..\..\..\..\src\dealer.cpp" />
      <File RelativePath="..\..\..\..\src\devpoll.cpp" />
+      <File RelativePath="..\..\..\..\src\dgram.cpp" />
+      <File RelativePath="..\..\..\..\src\dish.cpp" />
      <File RelativePath="..\..\..\..\src\dist.cpp" />
      <File RelativePath="..\..\..\..\src\epoll.cpp" />
      <File RelativePath="..\..\..\..\src\err.cpp" />
-      <File RelativePath="..\..\errno.cpp" />
      <File RelativePath="..\..\..\..\src\fq.cpp" />
      <File RelativePath="..\..\..\..\src\io_object.cpp" />
      <File RelativePath="..\..\..\..\src\io_thread.cpp" />
@ -140,6 +142,7 @@
      <File RelativePath="..\..\..\..\src\pub.cpp" />
      <File RelativePath="..\..\..\..\src\pull.cpp" />
      <File RelativePath="..\..\..\..\src\push.cpp" />
+      <File RelativePath="..\..\..\..\src\radio.cpp" />
      <File RelativePath="..\..\..\..\src\random.cpp" />
      <File RelativePath="..\..\..\..\src\raw_decoder.cpp" />
      <File RelativePath="..\..\..\..\src\raw_encoder.cpp" />
@ -160,32 +163,38 @@
      <File RelativePath="..\..\..\..\src\tcp_connecter.cpp" />
      <File RelativePath="..\..\..\..\src\tcp_listener.cpp" />
      <File RelativePath="..\..\..\..\src\thread.cpp" />
+      <File RelativePath="..\..\..\..\src\timers.cpp" />
      <File RelativePath="..\..\..\..\src\trie.cpp" />
      <File RelativePath="..\..\..\..\src\v1_decoder.cpp" />
      <File RelativePath="..\..\..\..\src\v1_encoder.cpp" />
      <File RelativePath="..\..\..\..\src\v2_decoder.cpp" />
      <File RelativePath="..\..\..\..\src\v2_encoder.cpp" />
+      <File RelativePath="..\..\..\..\src\udp_address.cpp" />
+      <File RelativePath="..\..\..\..\src\udp_engine.cpp" />
      <File RelativePath="..\..\..\..\src\xpub.cpp" />
      <File RelativePath="..\..\..\..\src\xsub.cpp" />
      <File RelativePath="..\..\..\..\src\zmq.cpp" />
      <File RelativePath="..\..\..\..\src\zmq_utils.cpp" />
    </Filter>
    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+      <File RelativePath="..\..\errno.hpp" />
      <File RelativePath="..\..\..\..\src\address.hpp" />
      <File RelativePath="..\..\..\..\src\array.hpp" />
      <File RelativePath="..\..\..\..\src\atomic_counter.hpp" />
      <File RelativePath="..\..\..\..\src\atomic_ptr.hpp" />
+      <File RelativePath="..\..\..\..\src\blob.hpp" />
      <File RelativePath="..\..\..\..\src\clock.hpp" />
      <File RelativePath="..\..\..\..\src\command.hpp" />
      <File RelativePath="..\..\..\..\src\config.hpp" />
      <File RelativePath="..\..\..\..\src\ctx.hpp" />
      <File RelativePath="..\..\..\..\src\decoder.hpp" />
      <File RelativePath="..\..\..\..\src\devpoll.hpp" />
+      <File RelativePath="..\..\..\..\src\dgram.hpp" />
+      <File RelativePath="..\..\..\..\src\dish.hpp" />
      <File RelativePath="..\..\..\..\src\dist.hpp" />
      <File RelativePath="..\..\..\..\src\encoder.hpp" />
      <File RelativePath="..\..\..\..\src\epoll.hpp" />
      <File RelativePath="..\..\..\..\src\err.hpp" />
-      <File RelativePath="..\..\errno.hpp" />
      <File RelativePath="..\..\..\..\src\fd.hpp" />
      <File RelativePath="..\..\..\..\src\fq.hpp" />
      <File RelativePath="..\..\..\..\src\i_engine.hpp" />
@ -224,6 +233,7 @@
      <File RelativePath="..\..\..\..\src\pub.hpp" />
      <File RelativePath="..\..\..\..\src\pull.hpp" />
      <File RelativePath="..\..\..\..\src\push.hpp" />
+      <File RelativePath="..\..\..\..\src\radio.hpp" />
      <File RelativePath="..\..\..\..\src\random.hpp" />
      <File RelativePath="..\..\..\..\src\raw_decoder.hpp" />
      <File RelativePath="..\..\..\..\src\raw_encoder.hpp" />
@ -243,6 +253,7 @@
      <File RelativePath="..\..\..\..\src\tcp_connecter.hpp" />
      <File RelativePath="..\..\..\..\src\tcp_listener.hpp" />
      <File RelativePath="..\..\..\..\src\thread.hpp" />
+      <File RelativePath="..\..\..\..\src\timers.hpp" />
      <File RelativePath="..\..\..\..\src\trie.hpp" />
      <File RelativePath="..\..\..\..\src\v1_decoder.hpp" />
      <File RelativePath="..\..\..\..\src\v1_encoder.hpp" />
@ -250,6 +261,8 @@
      <File RelativePath="..\..\..\..\src\v2_decoder.hpp" />
      <File RelativePath="..\..\..\..\src\v2_encoder.hpp" />
      <File RelativePath="..\..\..\..\src\v2_protocol.hpp" />
+      <File RelativePath="..\..\..\..\src\udp_address.hpp" />
+      <File RelativePath="..\..\..\..\src\udp_engine.hpp" />
      <File RelativePath="..\..\..\..\src\windows.hpp" />
      <File RelativePath="..\..\..\..\src\wire.hpp" />
      <File RelativePath="..\..\..\..\src\xpub.hpp" />
--- a/builds/msvc/vs2010/inproc_lat/inproc_lat.props
+++ b/builds/msvc/vs2010/inproc_lat/inproc_lat.props
@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>    
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libzmq.import.props" />
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-  
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>  
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj
+++ b/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}</ProjectGuid>
    <ProjectName>inproc_lat</ProjectName>
@ -61,7 +61,7 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup>
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2010/inproc_thr/inproc_thr.props
+++ b/builds/msvc/vs2010/inproc_thr/inproc_thr.props
@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>    
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libzmq.import.props" />
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>  
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj
+++ b/builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{1077E977-95DD-4E73-A692-74647DD0CC1E}</ProjectGuid>
    <ProjectName>inproc_thr</ProjectName>
@ -61,7 +61,7 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup>
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2010/libsodium.import.props
+++ b/builds/msvc/vs2010/libsodium.import.props
@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-  
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
-  </ItemGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
-          DestinationFiles="$(TargetDir)libsodium.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2010/libsodium.import.xml
+++ b/builds/msvc/vs2010/libsodium.import.xml
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
--- a/builds/msvc/vs2010/libzmq.import.props
+++ b/builds/msvc/vs2010/libzmq.import.props
@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
-  </ItemGroup>
-  
-  <PropertyGroup>
-    <Option-sodium>true</Option-sodium>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libzmq)' != ''">libzmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  
-  <!-- Copy -->
-
-  <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.pdb"
-          DestinationFiles="$(TargetDir)libzmq.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libzmq-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Message Text="Copying libzmq.dll -&gt; $(TargetDir)libzmq.dll" Importance="high"/>
-    <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2010/libzmq.import.xml
+++ b/builds/msvc/vs2010/libzmq.import.xml
@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="sodium" DisplayName="sodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-  <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
--- a/builds/msvc/vs2010/libzmq/libzmq.props
+++ b/builds/msvc/vs2010/libzmq/libzmq.props
@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ Library Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  
-    <!-- User Interface -->
-  
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <Option-sodium>true</Option-sodium>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnablePREfast>false</EnablePREfast>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;FD_SETSIZE=4096;ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Lib Condition="'$(ConfigurationType)'=='StaticLibrary'">
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-  
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
-    <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
-    <Message Text="Option-gssapi     : $(Option-gssapi)" Importance="high"/>
-  </Target>
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2010/libzmq/libzmq.vcxproj
@ -64,15 +64,18 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup>
  <ItemGroup>
+    <ClInclude Include="..\..\platform.hpp" />
+    <ClInclude Include="..\..\resource.h" />
    <ClInclude Include="..\..\..\..\include\zmq.h" />
-    <ClInclude Include="..\..\..\..\include\zmq_utils.h" />
+    <ClInclude Include="..\..\..\..\src\zmq_draft.h" />
    <ClInclude Include="..\..\..\..\src\address.hpp" />
    <ClInclude Include="..\..\..\..\src\array.hpp" />
    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
+    <ClInclude Include="..\..\..\..\src\blob.hpp" />
    <ClInclude Include="..\..\..\..\src\client.hpp" />
    <ClInclude Include="..\..\..\..\src\clock.hpp" />
    <ClInclude Include="..\..\..\..\src\command.hpp" />
@ -84,12 +87,15 @@
    <ClInclude Include="..\..\..\..\src\decoder.hpp" />
    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
    <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
+    <ClInclude Include="..\..\..\..\src\dgram.hpp" />
+    <ClInclude Include="..\..\..\..\src\dish.hpp" />
    <ClInclude Include="..\..\..\..\src\dist.hpp" />
    <ClInclude Include="..\..\..\..\src\encoder.hpp" />
    <ClInclude Include="..\..\..\..\src\epoll.hpp" />
    <ClInclude Include="..\..\..\..\src\err.hpp" />
    <ClInclude Include="..\..\..\..\src\fd.hpp" />
    <ClInclude Include="..\..\..\..\src\fq.hpp" />
+    <ClInclude Include="..\..\..\..\src\gather.hpp" />
    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp" />
    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp" />
    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp" />
@ -120,7 +126,6 @@
    <ClInclude Include="..\..\..\..\src\server.hpp" />
    <ClInclude Include="..\..\..\..\src\socks.hpp" />
    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
-    <ClInclude Include="..\..\platform.hpp" />
    <ClInclude Include="..\..\..\..\src\poll.hpp" />
    <ClInclude Include="..\..\..\..\src\poller.hpp" />
    <ClInclude Include="..\..\..\..\src\poller_base.hpp" />
@ -129,12 +134,14 @@
    <ClInclude Include="..\..\..\..\src\pub.hpp" />
    <ClInclude Include="..\..\..\..\src\pull.hpp" />
    <ClInclude Include="..\..\..\..\src\push.hpp" />
+    <ClInclude Include="..\..\..\..\src\radio.hpp" />
    <ClInclude Include="..\..\..\..\src\random.hpp" />
    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
    <ClInclude Include="..\..\..\..\src\reaper.hpp" />
    <ClInclude Include="..\..\..\..\src\rep.hpp" />
    <ClInclude Include="..\..\..\..\src\req.hpp" />
+    <ClInclude Include="..\..\..\..\src\scatter.hpp" />
    <ClInclude Include="..\..\..\..\src\select.hpp" />
    <ClInclude Include="..\..\..\..\src\session_base.hpp" />
    <ClInclude Include="..\..\..\..\src\signaler.hpp" />
@ -146,8 +153,12 @@
    <ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
+    <ClInclude Include="..\..\..\..\src\timers.hpp" />
    <ClInclude Include="..\..\..\..\src\thread.hpp" />
    <ClInclude Include="..\..\..\..\src\trie.hpp" />
+    <ClInclude Include="..\..\..\..\src\tweetnacl.h" />
+    <ClInclude Include="..\..\..\..\src\udp_address.hpp" />
+    <ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
@ -159,7 +170,6 @@
    <ClInclude Include="..\..\..\..\src\xsub.hpp" />
    <ClInclude Include="..\..\..\..\src\ypipe.hpp" />
    <ClInclude Include="..\..\..\..\src\yqueue.hpp" />
-    <ClInclude Include="..\..\resource.h" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\..\..\src\address.cpp" />
@ -171,10 +181,13 @@
    <ClCompile Include="..\..\..\..\src\dealer.cpp" />
    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
    <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
+    <ClCompile Include="..\..\..\..\src\dgram.cpp" />
+    <ClCompile Include="..\..\..\..\src\dish.cpp" />
    <ClCompile Include="..\..\..\..\src\dist.cpp" />
    <ClCompile Include="..\..\..\..\src\epoll.cpp" />
    <ClCompile Include="..\..\..\..\src\err.cpp" />
    <ClCompile Include="..\..\..\..\src\fq.cpp" />
+    <ClCompile Include="..\..\..\..\src\gather.cpp" />
    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp" />
    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp" />
    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp" />
@ -205,11 +218,14 @@
    <ClCompile Include="..\..\..\..\src\plain_server.cpp" />
    <ClCompile Include="..\..\..\..\src\poll.cpp" />
    <ClCompile Include="..\..\..\..\src\poller_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp" />
+    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\src\proxy.cpp" />
    <ClCompile Include="..\..\..\..\src\pub.cpp" />
    <ClCompile Include="..\..\..\..\src\pull.cpp" />
    <ClCompile Include="..\..\..\..\src\push.cpp" />
+    <ClCompile Include="..\..\..\..\src\radio.cpp" />
    <ClCompile Include="..\..\..\..\src\random.cpp" />
    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
@ -217,6 +233,7 @@
    <ClCompile Include="..\..\..\..\src\rep.cpp" />
    <ClCompile Include="..\..\..\..\src\req.cpp" />
    <ClCompile Include="..\..\..\..\src\router.cpp" />
+    <ClCompile Include="..\..\..\..\src\scatter.cpp" />
    <ClCompile Include="..\..\..\..\src\select.cpp" />
    <ClCompile Include="..\..\..\..\src\server.cpp" />
    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
@ -233,7 +250,13 @@
    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
    <ClCompile Include="..\..\..\..\src\thread.cpp" />
+    <ClCompile Include="..\..\..\..\src\timers.cpp" />
    <ClCompile Include="..\..\..\..\src\trie.cpp" />
+    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\udp_address.cpp" />
+    <ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
--- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
@ -16,6 +16,9 @@
    <ClCompile Include="..\..\..\..\src\devpoll.cpp">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\dgram.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\src\dist.cpp">
      <Filter>src</Filter>
    </ClCompile>
@ -139,6 +142,9 @@
    <ClCompile Include="..\..\..\..\src\router.cpp">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\scatter.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\src\select.cpp">
      <Filter>src</Filter>
    </ClCompile>
@ -211,6 +217,9 @@
    <ClCompile Include="..\..\..\..\src\curve_server.cpp">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\gather.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
      <Filter>src</Filter>
    </ClCompile>
@ -238,14 +247,29 @@
    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
      <Filter>src</Filter>
    </ClCompile>
-	<ClCompile Include="..\..\..\..\src\socket_poller.cpp">
+    <ClCompile Include="..\..\..\..\src\socket_poller.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\udp_address.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\udp_engine.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\dish.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\radio.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\timers.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
      <Filter>src</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\zmq_utils.h">
-      <Filter>include</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\..\..\include\zmq.h">
      <Filter>include</Filter>
    </ClInclude>
@ -261,6 +285,9 @@
    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\blob.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\..\..\src\clock.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
@ -276,6 +303,9 @@
    <ClInclude Include="..\..\..\..\src\devpoll.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\dgram.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\..\..\src\dist.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
@ -426,6 +456,9 @@
    <ClInclude Include="..\..\..\..\src\session_base.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\scatter.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\..\..\src\select.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
@ -492,6 +525,9 @@
    <ClInclude Include="..\..\..\..\src\curve_server.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\gather.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
@ -522,6 +558,27 @@
    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\udp_address.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\udp_engine.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\dish.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\radio.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\timers.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\tweetnacl.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\zmq_draft.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <Filter Include="include">
--- a/builds/msvc/vs2010/libzmq/libzmq.xml
+++ b/builds/msvc/vs2010/libzmq/libzmq.xml
@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
--- a/builds/msvc/vs2010/local_lat/local_lat.props
+++ b/builds/msvc/vs2010/local_lat/local_lat.props
@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>    
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libzmq.import.props" />
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>  
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2010/local_lat/local_lat.vcxproj
+++ b/builds/msvc/vs2010/local_lat/local_lat.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}</ProjectGuid>
    <ProjectName>local_lat</ProjectName>
@ -61,7 +61,7 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup> 
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2010/local_thr/local_thr.vcxproj
+++ b/builds/msvc/vs2010/local_thr/local_thr.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{8EF2DF6B-6646-460F-8032-913B70FE0E94}</ProjectGuid>
    <ProjectName>local_thr</ProjectName>
@ -56,16 +56,12 @@
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup>
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2010/remote_lat/remote_lat.vcxproj
+++ b/builds/msvc/vs2010/remote_lat/remote_lat.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}</ProjectGuid>
    <ProjectName>remote_lat</ProjectName>
@ -56,16 +56,12 @@
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup> 
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2010/remote_thr/remote_thr.props
+++ b/builds/msvc/vs2010/remote_thr/remote_thr.props
@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>    
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libzmq.import.props" />
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>  
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2010/remote_thr/remote_thr.vcxproj
+++ b/builds/msvc/vs2010/remote_thr/remote_thr.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{B15E059C-0CBB-4A82-8C42-6567FB650802}</ProjectGuid>
    <ProjectName>remote_thr</ProjectName>
@ -61,7 +61,7 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup>  
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj
+++ b/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}</ProjectGuid>
    <ProjectName>inproc_lat</ProjectName>
@ -61,7 +61,7 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup>
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2012/inproc_thr/inproc_thr.props
+++ b/builds/msvc/vs2012/inproc_thr/inproc_thr.props
@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>    
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libzmq.import.props" />
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>  
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj
+++ b/builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{1077E977-95DD-4E73-A692-74647DD0CC1E}</ProjectGuid>
    <ProjectName>inproc_thr</ProjectName>
@ -61,7 +61,7 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup>
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2012/libsodium.import.xml
+++ b/builds/msvc/vs2012/libsodium.import.xml
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
--- a/builds/msvc/vs2012/libzmq.import.props
+++ b/builds/msvc/vs2012/libzmq.import.props
@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
-  </ItemGroup>
-  
-  <PropertyGroup>
-    <Option-sodium>true</Option-sodium>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libzmq)' != ''">libzmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  
-  <!-- Copy -->
-
-  <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.pdb"
-          DestinationFiles="$(TargetDir)libzmq.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libzmq-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Message Text="Copying libzmq.dll -&gt; $(TargetDir)libzmq.dll" Importance="high"/>
-    <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2012/libzmq.import.xml
+++ b/builds/msvc/vs2012/libzmq.import.xml
@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="sodium" DisplayName="sodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-  <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
--- a/builds/msvc/vs2012/libzmq/libzmq.props
+++ b/builds/msvc/vs2012/libzmq/libzmq.props
@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ Library Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  
-    <!-- User Interface -->
-  
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <Option-sodium>true</Option-sodium>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnablePREfast>false</EnablePREfast>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;FD_SETSIZE=4096;ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Lib Condition="'$(ConfigurationType)'=='StaticLibrary'">
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-  
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
-    <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
-    <Message Text="Option-gssapi     : $(Option-gssapi)" Importance="high"/>
-  </Target>
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj
@ -64,11 +64,14 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup>
  <ItemGroup>
+    <ClInclude Include="..\..\platform.hpp" />
+    <ClInclude Include="..\..\resource.h" />
    <ClInclude Include="..\..\..\..\include\zmq.h" />
-    <ClInclude Include="..\..\..\..\include\zmq_utils.h" />
+    <ClInclude Include="..\..\..\..\src\zmq_draft.h" />
+    <ClInclude Include="..\..\..\..\src\blob.hpp" />
    <ClInclude Include="..\..\..\..\src\address.hpp" />
    <ClInclude Include="..\..\..\..\src\array.hpp" />
    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
@ -84,12 +87,15 @@
    <ClInclude Include="..\..\..\..\src\decoder.hpp" />
    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
    <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
+    <ClInclude Include="..\..\..\..\src\dgram.hpp" />
+    <ClInclude Include="..\..\..\..\src\dish.hpp" />
    <ClInclude Include="..\..\..\..\src\dist.hpp" />
    <ClInclude Include="..\..\..\..\src\encoder.hpp" />
    <ClInclude Include="..\..\..\..\src\epoll.hpp" />
    <ClInclude Include="..\..\..\..\src\err.hpp" />
    <ClInclude Include="..\..\..\..\src\fd.hpp" />
    <ClInclude Include="..\..\..\..\src\fq.hpp" />
+    <ClInclude Include="..\..\..\..\src\gather.hpp" />
    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp" />
    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp" />
    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp" />
@ -120,7 +126,6 @@
    <ClInclude Include="..\..\..\..\src\server.hpp" />
    <ClInclude Include="..\..\..\..\src\socks.hpp" />
    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
-    <ClInclude Include="..\..\platform.hpp" />
    <ClInclude Include="..\..\..\..\src\poll.hpp" />
    <ClInclude Include="..\..\..\..\src\poller.hpp" />
    <ClInclude Include="..\..\..\..\src\poller_base.hpp" />
@ -129,12 +134,14 @@
    <ClInclude Include="..\..\..\..\src\pub.hpp" />
    <ClInclude Include="..\..\..\..\src\pull.hpp" />
    <ClInclude Include="..\..\..\..\src\push.hpp" />
+    <ClInclude Include="..\..\..\..\src\radio.hpp" />
    <ClInclude Include="..\..\..\..\src\random.hpp" />
    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
    <ClInclude Include="..\..\..\..\src\reaper.hpp" />
    <ClInclude Include="..\..\..\..\src\rep.hpp" />
    <ClInclude Include="..\..\..\..\src\req.hpp" />
+    <ClInclude Include="..\..\..\..\src\scatter.hpp" />
    <ClInclude Include="..\..\..\..\src\select.hpp" />
    <ClInclude Include="..\..\..\..\src\session_base.hpp" />
    <ClInclude Include="..\..\..\..\src\signaler.hpp" />
@ -146,8 +153,12 @@
    <ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
+    <ClInclude Include="..\..\..\..\src\timers.hpp" />
    <ClInclude Include="..\..\..\..\src\thread.hpp" />
    <ClInclude Include="..\..\..\..\src\trie.hpp" />
+    <ClInclude Include="..\..\..\..\src\tweetnacl.h" />
+    <ClInclude Include="..\..\..\..\src\udp_address.hpp" />
+    <ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
@ -159,7 +170,6 @@
    <ClInclude Include="..\..\..\..\src\xsub.hpp" />
    <ClInclude Include="..\..\..\..\src\ypipe.hpp" />
    <ClInclude Include="..\..\..\..\src\yqueue.hpp" />
-    <ClInclude Include="..\..\resource.h" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\..\..\src\address.cpp" />
@ -171,10 +181,13 @@
    <ClCompile Include="..\..\..\..\src\dealer.cpp" />
    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
    <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
+    <ClCompile Include="..\..\..\..\src\dgram.cpp" />
+    <ClCompile Include="..\..\..\..\src\dish.cpp" />
    <ClCompile Include="..\..\..\..\src\dist.cpp" />
    <ClCompile Include="..\..\..\..\src\epoll.cpp" />
    <ClCompile Include="..\..\..\..\src\err.cpp" />
    <ClCompile Include="..\..\..\..\src\fq.cpp" />
+    <ClCompile Include="..\..\..\..\src\gather.cpp" />
    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp" />
    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp" />
    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp" />
@ -205,11 +218,14 @@
    <ClCompile Include="..\..\..\..\src\plain_server.cpp" />
    <ClCompile Include="..\..\..\..\src\poll.cpp" />
    <ClCompile Include="..\..\..\..\src\poller_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp" />
+    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\src\proxy.cpp" />
    <ClCompile Include="..\..\..\..\src\pub.cpp" />
    <ClCompile Include="..\..\..\..\src\pull.cpp" />
    <ClCompile Include="..\..\..\..\src\push.cpp" />
+    <ClCompile Include="..\..\..\..\src\radio.cpp" />
    <ClCompile Include="..\..\..\..\src\random.cpp" />
    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
@ -217,6 +233,7 @@
    <ClCompile Include="..\..\..\..\src\rep.cpp" />
    <ClCompile Include="..\..\..\..\src\req.cpp" />
    <ClCompile Include="..\..\..\..\src\router.cpp" />
+    <ClCompile Include="..\..\..\..\src\scatter.cpp" />
    <ClCompile Include="..\..\..\..\src\select.cpp" />
    <ClCompile Include="..\..\..\..\src\server.cpp" />
    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
@ -233,7 +250,13 @@
    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
    <ClCompile Include="..\..\..\..\src\thread.cpp" />
+    <ClCompile Include="..\..\..\..\src\timers.cpp" />
    <ClCompile Include="..\..\..\..\src\trie.cpp" />
+    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\udp_address.cpp" />
+    <ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
--- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
@ -16,6 +16,9 @@
    <ClCompile Include="..\..\..\..\src\devpoll.cpp">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\dgram.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\src\dist.cpp">
      <Filter>src</Filter>
    </ClCompile>
@ -139,6 +142,9 @@
    <ClCompile Include="..\..\..\..\src\router.cpp">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\scatter.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\src\select.cpp">
      <Filter>src</Filter>
    </ClCompile>
@ -211,6 +217,9 @@
    <ClCompile Include="..\..\..\..\src\curve_server.cpp">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\gather.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
      <Filter>src</Filter>
    </ClCompile>
@ -238,14 +247,29 @@
    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
      <Filter>src</Filter>
    </ClCompile>
-	<ClCompile Include="..\..\..\..\src\socket_poller.cpp">
+    <ClCompile Include="..\..\..\..\src\socket_poller.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\udp_address.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\udp_engine.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\dish.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\radio.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\timers.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
      <Filter>src</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\zmq_utils.h">
-      <Filter>include</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\..\..\include\zmq.h">
      <Filter>include</Filter>
    </ClInclude>
@ -261,6 +285,9 @@
    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\blob.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\..\..\src\clock.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
@ -276,6 +303,9 @@
    <ClInclude Include="..\..\..\..\src\devpoll.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\dgram.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\..\..\src\dist.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
@ -426,6 +456,9 @@
    <ClInclude Include="..\..\..\..\src\session_base.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\scatter.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\..\..\src\select.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
@ -492,6 +525,9 @@
    <ClInclude Include="..\..\..\..\src\curve_server.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\gather.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
@ -522,6 +558,27 @@
    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\udp_address.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\udp_engine.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\dish.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\radio.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\timers.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\tweetnacl.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\zmq_draft.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <Filter Include="include">
--- a/builds/msvc/vs2012/libzmq/libzmq.xml
+++ b/builds/msvc/vs2012/libzmq/libzmq.xml
@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
--- a/builds/msvc/vs2012/local_lat/local_lat.props
+++ b/builds/msvc/vs2012/local_lat/local_lat.props
@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>    
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libzmq.import.props" />
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>  
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2012/local_lat/local_lat.vcxproj
+++ b/builds/msvc/vs2012/local_lat/local_lat.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}</ProjectGuid>
    <ProjectName>local_lat</ProjectName>
@ -61,7 +61,7 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup> 
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2012/local_thr/local_thr.props
+++ b/builds/msvc/vs2012/local_thr/local_thr.props
@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>    
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libzmq.import.props" />
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>  
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2012/local_thr/local_thr.vcxproj
+++ b/builds/msvc/vs2012/local_thr/local_thr.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{8EF2DF6B-6646-460F-8032-913B70FE0E94}</ProjectGuid>
    <ProjectName>local_thr</ProjectName>
@ -56,16 +56,12 @@
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v110</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup>
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2012/remote_lat/remote_lat.props
+++ b/builds/msvc/vs2012/remote_lat/remote_lat.props
@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>    
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libzmq.import.props" />
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>  
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2012/remote_lat/remote_lat.vcxproj
+++ b/builds/msvc/vs2012/remote_lat/remote_lat.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}</ProjectGuid>
    <ProjectName>remote_lat</ProjectName>
@ -56,16 +56,12 @@
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v110</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup> 
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2012/remote_thr/remote_thr.props
+++ b/builds/msvc/vs2012/remote_thr/remote_thr.props
@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>    
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libzmq.import.props" />
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>  
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2012/remote_thr/remote_thr.vcxproj
+++ b/builds/msvc/vs2012/remote_thr/remote_thr.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{B15E059C-0CBB-4A82-8C42-6567FB650802}</ProjectGuid>
    <ProjectName>remote_thr</ProjectName>
@ -61,7 +61,7 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup>  
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2013/inproc_lat/inproc_lat.props
+++ b/builds/msvc/vs2013/inproc_lat/inproc_lat.props
@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>    
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libzmq.import.props" />
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-  
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>  
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj
+++ b/builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}</ProjectGuid>
    <ProjectName>inproc_lat</ProjectName>
@ -61,7 +61,7 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup>
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj
+++ b/builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{1077E977-95DD-4E73-A692-74647DD0CC1E}</ProjectGuid>
    <ProjectName>inproc_thr</ProjectName>
@ -61,7 +61,7 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup>
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2013/libsodium.import.props
+++ b/builds/msvc/vs2013/libsodium.import.props
@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-  
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
-  </ItemGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
-          DestinationFiles="$(TargetDir)libsodium.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2013/libsodium.import.xml
+++ b/builds/msvc/vs2013/libsodium.import.xml
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
--- a/builds/msvc/vs2013/libzmq.import.props
+++ b/builds/msvc/vs2013/libzmq.import.props
@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
-  </ItemGroup>
-  
-  <PropertyGroup>
-    <Option-sodium>true</Option-sodium>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libzmq)' != ''">libzmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  
-  <!-- Copy -->
-
-  <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.pdb"
-          DestinationFiles="$(TargetDir)libzmq.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libzmq-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Message Text="Copying libzmq.dll -&gt; $(TargetDir)libzmq.dll" Importance="high"/>
-    <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2013/libzmq.import.xml
+++ b/builds/msvc/vs2013/libzmq.import.xml
@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="sodium" DisplayName="sodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-  <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
--- a/builds/msvc/vs2013/libzmq/libzmq.props
+++ b/builds/msvc/vs2013/libzmq/libzmq.props
@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ Library Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  
-    <!-- User Interface -->
-  
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <Option-sodium>true</Option-sodium>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnablePREfast>false</EnablePREfast>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;FD_SETSIZE=4096;ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">HAVE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Lib Condition="'$(ConfigurationType)'=='StaticLibrary'">
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-  
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
-    <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
-    <Message Text="Option-gssapi     : $(Option-gssapi)" Importance="high"/>
-  </Target>
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2013/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj
@ -1,260 +1,283 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{641C5F36-32EE-4323-B740-992B651CF9D6}</ProjectGuid>
-    <ProjectName>libzmq</ProjectName>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDLL|Win32">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|Win32">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDLL|x64">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|x64">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|Win32">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|Win32">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|x64">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|x64">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|Win32">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|Win32">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|x64">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|x64">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) == -1">StaticLibrary</ConfigurationType>
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) != -1">DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\zmq.h" />
-    <ClInclude Include="..\..\..\..\include\zmq_utils.h" />
-    <ClInclude Include="..\..\..\..\src\address.hpp" />
-    <ClInclude Include="..\..\..\..\src\array.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
-    <ClInclude Include="..\..\..\..\src\client.hpp" />
-    <ClInclude Include="..\..\..\..\src\clock.hpp" />
-    <ClInclude Include="..\..\..\..\src\command.hpp" />
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp" />
-    <ClInclude Include="..\..\..\..\src\config.hpp" />
-    <ClInclude Include="..\..\..\..\src\ctx.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\dist.hpp" />
-    <ClInclude Include="..\..\..\..\src\encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\epoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\err.hpp" />
-    <ClInclude Include="..\..\..\..\src\fd.hpp" />
-    <ClInclude Include="..\..\..\..\src\fq.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_object.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\ip.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp" />
-    <ClInclude Include="..\..\..\..\src\lb.hpp" />
-    <ClInclude Include="..\..\..\..\src\likely.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp" />
-    <ClInclude Include="..\..\..\..\src\msg.hpp" />
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp" />
-    <ClInclude Include="..\..\..\..\src\mutex.hpp" />
-    <ClInclude Include="..\..\..\..\src\object.hpp" />
-    <ClInclude Include="..\..\..\..\src\options.hpp" />
-    <ClInclude Include="..\..\..\..\src\own.hpp" />
-    <ClInclude Include="..\..\..\..\src\pair.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
-    <ClInclude Include="..\..\..\..\src\pipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\server.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
-    <ClInclude Include="..\..\platform.hpp" />
-    <ClInclude Include="..\..\..\..\src\poll.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp" />
-    <ClInclude Include="..\..\..\..\src\proxy.hpp" />
-    <ClInclude Include="..\..\..\..\src\pub.hpp" />
-    <ClInclude Include="..\..\..\..\src\pull.hpp" />
-    <ClInclude Include="..\..\..\..\src\push.hpp" />
-    <ClInclude Include="..\..\..\..\src\random.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\reaper.hpp" />
-    <ClInclude Include="..\..\..\..\src\rep.hpp" />
-    <ClInclude Include="..\..\..\..\src\req.hpp" />
-    <ClInclude Include="..\..\..\..\src\select.hpp" />
-    <ClInclude Include="..\..\..\..\src\session_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\signaler.hpp" />
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\stdint.hpp" />
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\sub.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\trie.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
-    <ClInclude Include="..\..\..\..\src\windows.hpp" />
-    <ClInclude Include="..\..\..\..\src\wire.hpp" />
-    <ClInclude Include="..\..\..\..\src\xpub.hpp" />
-    <ClInclude Include="..\..\..\..\src\xrep.hpp" />
-    <ClInclude Include="..\..\..\..\src\xreq.hpp" />
-    <ClInclude Include="..\..\..\..\src\xsub.hpp" />
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp" />
-    <ClInclude Include="..\..\resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp" />
-    <ClCompile Include="..\..\..\..\src\client.cpp" />
-    <ClCompile Include="..\..\..\..\src\clock.cpp" />
-    <ClCompile Include="..\..\..\..\src\ctx.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\dealer.cpp" />
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\dist.cpp" />
-    <ClCompile Include="..\..\..\..\src\epoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\err.cpp" />
-    <ClCompile Include="..\..\..\..\src\fq.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_object.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\ip.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp" />
-    <ClCompile Include="..\..\..\..\src\lb.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\metadata.cpp" />
-    <ClCompile Include="..\..\..\..\src\msg.cpp" />
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp" />
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\object.cpp" />
-    <ClCompile Include="..\..\..\..\src\options.cpp" />
-    <ClCompile Include="..\..\..\..\src\own.cpp" />
-    <ClCompile Include="..\..\..\..\src\pair.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp" />
-    <ClCompile Include="..\..\..\..\src\pipe.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\poll.cpp" />
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp" />
-    <ClCompile Include="..\..\..\..\src\proxy.cpp" />
-    <ClCompile Include="..\..\..\..\src\pub.cpp" />
-    <ClCompile Include="..\..\..\..\src\pull.cpp" />
-    <ClCompile Include="..\..\..\..\src\push.cpp" />
-    <ClCompile Include="..\..\..\..\src\random.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\reaper.cpp" />
-    <ClCompile Include="..\..\..\..\src\rep.cpp" />
-    <ClCompile Include="..\..\..\..\src\req.cpp" />
-    <ClCompile Include="..\..\..\..\src\router.cpp" />
-    <ClCompile Include="..\..\..\..\src\select.cpp" />
-    <ClCompile Include="..\..\..\..\src\server.cpp" />
-    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\signaler.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\sub.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\trie.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\xpub.cpp" />
-    <ClCompile Include="..\..\..\..\src\xsub.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat" />
-    <None Include="..\..\..\..\packaging\nuget\package.config" />
-    <None Include="..\..\..\..\packaging\nuget\package.gsl" />
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec" />
-    <None Include="..\..\..\..\packaging\nuget\package.targets" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{641C5F36-32EE-4323-B740-992B651CF9D6}</ProjectGuid>
+    <ProjectName>libzmq</ProjectName>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="DebugDLL|Win32">
+      <Configuration>DebugDLL</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseDLL|Win32">
+      <Configuration>ReleaseDLL</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugDLL|x64">
+      <Configuration>DebugDLL</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseDLL|x64">
+      <Configuration>ReleaseDLL</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugLTCG|Win32">
+      <Configuration>DebugLTCG</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseLTCG|Win32">
+      <Configuration>ReleaseLTCG</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugLTCG|x64">
+      <Configuration>DebugLTCG</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseLTCG|x64">
+      <Configuration>ReleaseLTCG</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugLIB|Win32">
+      <Configuration>DebugLIB</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseLIB|Win32">
+      <Configuration>ReleaseLIB</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="DebugLIB|x64">
+      <Configuration>DebugLIB</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="ReleaseLIB|x64">
+      <Configuration>ReleaseLIB</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) == -1">StaticLibrary</ConfigurationType>
+    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) != -1">DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
+  </ImportGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\platform.hpp" />
+    <ClInclude Include="..\..\resource.h" />
+    <ClInclude Include="..\..\..\..\include\zmq.h" />
+    <ClInclude Include="..\..\..\..\src\zmq_draft.h" />
+    <ClInclude Include="..\..\..\..\src\address.hpp" />
+    <ClInclude Include="..\..\..\..\src\array.hpp" />
+    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
+    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
+    <ClInclude Include="..\..\..\..\src\blob.hpp" />
+    <ClInclude Include="..\..\..\..\src\client.hpp" />
+    <ClInclude Include="..\..\..\..\src\clock.hpp" />
+    <ClInclude Include="..\..\..\..\src\command.hpp" />
+    <ClInclude Include="..\..\..\..\src\condition_variable.hpp" />
+    <ClInclude Include="..\..\..\..\src\config.hpp" />
+    <ClInclude Include="..\..\..\..\src\ctx.hpp" />
+    <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
+    <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
+    <ClInclude Include="..\..\..\..\src\decoder.hpp" />
+    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
+    <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
+    <ClInclude Include="..\..\..\..\src\dgram.hpp" />
+    <ClInclude Include="..\..\..\..\src\dish.hpp" />
+    <ClInclude Include="..\..\..\..\src\dist.hpp" />
+    <ClInclude Include="..\..\..\..\src\encoder.hpp" />
+    <ClInclude Include="..\..\..\..\src\epoll.hpp" />
+    <ClInclude Include="..\..\..\..\src\err.hpp" />
+    <ClInclude Include="..\..\..\..\src\fd.hpp" />
+    <ClInclude Include="..\..\..\..\src\fq.hpp" />
+    <ClInclude Include="..\..\..\..\src\gather.hpp" />
+    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp" />
+    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp" />
+    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp" />
+    <ClInclude Include="..\..\..\..\src\i_engine.hpp" />
+    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp" />
+    <ClInclude Include="..\..\..\..\src\io_object.hpp" />
+    <ClInclude Include="..\..\..\..\src\io_thread.hpp" />
+    <ClInclude Include="..\..\..\..\src\ip.hpp" />
+    <ClInclude Include="..\..\..\..\src\ipc_address.hpp" />
+    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp" />
+    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp" />
+    <ClInclude Include="..\..\..\..\src\kqueue.hpp" />
+    <ClInclude Include="..\..\..\..\src\lb.hpp" />
+    <ClInclude Include="..\..\..\..\src\likely.hpp" />
+    <ClInclude Include="..\..\..\..\src\mailbox.hpp" />
+    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp" />
+    <ClInclude Include="..\..\..\..\src\msg.hpp" />
+    <ClInclude Include="..\..\..\..\src\mtrie.hpp" />
+    <ClInclude Include="..\..\..\..\src\mutex.hpp" />
+    <ClInclude Include="..\..\..\..\src\object.hpp" />
+    <ClInclude Include="..\..\..\..\src\options.hpp" />
+    <ClInclude Include="..\..\..\..\src\own.hpp" />
+    <ClInclude Include="..\..\..\..\src\pair.hpp" />
+    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp" />
+    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
+    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
+    <ClInclude Include="..\..\..\..\src\pipe.hpp" />
+    <ClInclude Include="..\..\..\..\src\server.hpp" />
+    <ClInclude Include="..\..\..\..\src\socks.hpp" />
+    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
+    <ClInclude Include="..\..\..\..\src\poll.hpp" />
+    <ClInclude Include="..\..\..\..\src\poller.hpp" />
+    <ClInclude Include="..\..\..\..\src\poller_base.hpp" />
+    <ClInclude Include="..\..\..\..\src\precompiled.hpp" />
+    <ClInclude Include="..\..\..\..\src\proxy.hpp" />
+    <ClInclude Include="..\..\..\..\src\pub.hpp" />
+    <ClInclude Include="..\..\..\..\src\pull.hpp" />
+    <ClInclude Include="..\..\..\..\src\push.hpp" />
+    <ClInclude Include="..\..\..\..\src\radio.hpp" />
+    <ClInclude Include="..\..\..\..\src\random.hpp" />
+    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
+    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
+    <ClInclude Include="..\..\..\..\src\reaper.hpp" />
+    <ClInclude Include="..\..\..\..\src\rep.hpp" />
+    <ClInclude Include="..\..\..\..\src\req.hpp" />
+    <ClInclude Include="..\..\..\..\src\scatter.hpp" />
+    <ClInclude Include="..\..\..\..\src\select.hpp" />
+    <ClInclude Include="..\..\..\..\src\session_base.hpp" />
+    <ClInclude Include="..\..\..\..\src\signaler.hpp" />
+    <ClInclude Include="..\..\..\..\src\socket_base.hpp" />
+    <ClInclude Include="..\..\..\..\src\stdint.hpp" />
+    <ClInclude Include="..\..\..\..\src\stream_engine.hpp" />
+    <ClInclude Include="..\..\..\..\src\sub.hpp" />
+    <ClInclude Include="..\..\..\..\src\tcp.hpp" />
+    <ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
+    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
+    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
+    <ClInclude Include="..\..\..\..\src\timers.hpp" />
+    <ClInclude Include="..\..\..\..\src\thread.hpp" />
+    <ClInclude Include="..\..\..\..\src\trie.hpp" />
+    <ClInclude Include="..\..\..\..\src\tweetnacl.h" />
+    <ClInclude Include="..\..\..\..\src\udp_address.hpp" />
+    <ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
+    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
+    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
+    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
+    <ClInclude Include="..\..\..\..\src\windows.hpp" />
+    <ClInclude Include="..\..\..\..\src\wire.hpp" />
+    <ClInclude Include="..\..\..\..\src\xpub.hpp" />
+    <ClInclude Include="..\..\..\..\src\xrep.hpp" />
+    <ClInclude Include="..\..\..\..\src\xreq.hpp" />
+    <ClInclude Include="..\..\..\..\src\xsub.hpp" />
+    <ClInclude Include="..\..\..\..\src\ypipe.hpp" />
+    <ClInclude Include="..\..\..\..\src\yqueue.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\address.cpp" />
+    <ClCompile Include="..\..\..\..\src\client.cpp" />
+    <ClCompile Include="..\..\..\..\src\clock.cpp" />
+    <ClCompile Include="..\..\..\..\src\ctx.cpp" />
+    <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
+    <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
+    <ClCompile Include="..\..\..\..\src\dealer.cpp" />
+    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
+    <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
+    <ClCompile Include="..\..\..\..\src\dgram.cpp" />
+    <ClCompile Include="..\..\..\..\src\dish.cpp" />
+    <ClCompile Include="..\..\..\..\src\dist.cpp" />
+    <ClCompile Include="..\..\..\..\src\epoll.cpp" />
+    <ClCompile Include="..\..\..\..\src\err.cpp" />
+    <ClCompile Include="..\..\..\..\src\fq.cpp" />
+    <ClCompile Include="..\..\..\..\src\gather.cpp" />
+    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp" />
+    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp" />
+    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp" />
+    <ClCompile Include="..\..\..\..\src\io_object.cpp" />
+    <ClCompile Include="..\..\..\..\src\io_thread.cpp" />
+    <ClCompile Include="..\..\..\..\src\ip.cpp" />
+    <ClCompile Include="..\..\..\..\src\ipc_address.cpp" />
+    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp" />
+    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp" />
+    <ClCompile Include="..\..\..\..\src\kqueue.cpp" />
+    <ClCompile Include="..\..\..\..\src\lb.cpp" />
+    <ClCompile Include="..\..\..\..\src\mailbox.cpp" />
+    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp" />
+    <ClCompile Include="..\..\..\..\src\mechanism.cpp" />
+    <ClCompile Include="..\..\..\..\src\metadata.cpp" />
+    <ClCompile Include="..\..\..\..\src\msg.cpp" />
+    <ClCompile Include="..\..\..\..\src\mtrie.cpp" />
+    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
+    <ClCompile Include="..\..\..\..\src\object.cpp" />
+    <ClCompile Include="..\..\..\..\src\options.cpp" />
+    <ClCompile Include="..\..\..\..\src\own.cpp" />
+    <ClCompile Include="..\..\..\..\src\pair.cpp" />
+    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp" />
+    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp" />
+    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp" />
+    <ClCompile Include="..\..\..\..\src\pipe.cpp" />
+    <ClCompile Include="..\..\..\..\src\plain_client.cpp" />
+    <ClCompile Include="..\..\..\..\src\plain_server.cpp" />
+    <ClCompile Include="..\..\..\..\src\poll.cpp" />
+    <ClCompile Include="..\..\..\..\src\poller_base.cpp" />
+    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\proxy.cpp" />
+    <ClCompile Include="..\..\..\..\src\pub.cpp" />
+    <ClCompile Include="..\..\..\..\src\pull.cpp" />
+    <ClCompile Include="..\..\..\..\src\push.cpp" />
+    <ClCompile Include="..\..\..\..\src\radio.cpp" />
+    <ClCompile Include="..\..\..\..\src\random.cpp" />
+    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
+    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
+    <ClCompile Include="..\..\..\..\src\reaper.cpp" />
+    <ClCompile Include="..\..\..\..\src\rep.cpp" />
+    <ClCompile Include="..\..\..\..\src\req.cpp" />
+    <ClCompile Include="..\..\..\..\src\router.cpp" />
+    <ClCompile Include="..\..\..\..\src\scatter.cpp" />
+    <ClCompile Include="..\..\..\..\src\select.cpp" />
+    <ClCompile Include="..\..\..\..\src\server.cpp" />
+    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
+    <ClCompile Include="..\..\..\..\src\signaler.cpp" />
+    <ClCompile Include="..\..\..\..\src\socket_base.cpp" />
+    <ClCompile Include="..\..\..\..\src\socket_poller.cpp" />
+    <ClCompile Include="..\..\..\..\src\socks.cpp" />
+    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp" />
+    <ClCompile Include="..\..\..\..\src\stream.cpp" />
+    <ClCompile Include="..\..\..\..\src\stream_engine.cpp" />
+    <ClCompile Include="..\..\..\..\src\sub.cpp" />
+    <ClCompile Include="..\..\..\..\src\tcp.cpp" />
+    <ClCompile Include="..\..\..\..\src\tcp_address.cpp" />
+    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
+    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
+    <ClCompile Include="..\..\..\..\src\thread.cpp" />
+    <ClCompile Include="..\..\..\..\src\timers.cpp" />
+    <ClCompile Include="..\..\..\..\src\trie.cpp" />
+    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\udp_address.cpp" />
+    <ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
+    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
+    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
+    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
+    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
+    <ClCompile Include="..\..\..\..\src\xpub.cpp" />
+    <ClCompile Include="..\..\..\..\src\xsub.cpp" />
+    <ClCompile Include="..\..\..\..\src\zmq.cpp" />
+    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\packaging\nuget\package.bat" />
+    <None Include="..\..\..\..\packaging\nuget\package.config" />
+    <None Include="..\..\..\..\packaging\nuget\package.gsl" />
+    <None Include="..\..\..\..\packaging\nuget\package.nuspec" />
+    <None Include="..\..\..\..\packaging\nuget\package.targets" />
+  </ItemGroup>
+  <ItemGroup>
+    <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\resource.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
@ -16,6 +16,9 @@
    <ClCompile Include="..\..\..\..\src\devpoll.cpp">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\dgram.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\src\dist.cpp">
      <Filter>src</Filter>
    </ClCompile>
@ -139,6 +142,9 @@
    <ClCompile Include="..\..\..\..\src\router.cpp">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\scatter.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\src\select.cpp">
      <Filter>src</Filter>
    </ClCompile>
@ -211,6 +217,9 @@
    <ClCompile Include="..\..\..\..\src\curve_server.cpp">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\gather.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
      <Filter>src</Filter>
    </ClCompile>
@ -241,11 +250,26 @@
    <ClCompile Include="..\..\..\..\src\socket_poller.cpp">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\udp_address.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\udp_engine.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\dish.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\radio.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\timers.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
+      <Filter>src</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\zmq_utils.h">
-      <Filter>include</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\..\..\include\zmq.h">
      <Filter>include</Filter>
    </ClInclude>
@ -261,6 +285,9 @@
    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\blob.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\..\..\src\clock.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
@ -276,6 +303,9 @@
    <ClInclude Include="..\..\..\..\src\devpoll.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\dgram.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\..\..\src\dist.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
@ -426,6 +456,9 @@
    <ClInclude Include="..\..\..\..\src\session_base.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\scatter.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\..\..\src\select.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
@ -492,6 +525,9 @@
    <ClInclude Include="..\..\..\..\src\curve_server.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\gather.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
@ -522,6 +558,27 @@
    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
      <Filter>src\include</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\udp_address.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\udp_engine.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\dish.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\radio.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\timers.hpp">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\tweetnacl.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\zmq_draft.h">
+      <Filter>src\include</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <Filter Include="include">
--- a/builds/msvc/vs2013/libzmq/libzmq.xml
+++ b/builds/msvc/vs2013/libzmq/libzmq.xml
@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
--- a/builds/msvc/vs2013/local_lat/local_lat.vcxproj
+++ b/builds/msvc/vs2013/local_lat/local_lat.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}</ProjectGuid>
    <ProjectName>local_lat</ProjectName>
@ -61,7 +61,7 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup> 
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2013/local_thr/local_thr.props
+++ b/builds/msvc/vs2013/local_thr/local_thr.props
@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>    
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libzmq.import.props" />
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>  
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2013/local_thr/local_thr.vcxproj
+++ b/builds/msvc/vs2013/local_thr/local_thr.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{8EF2DF6B-6646-460F-8032-913B70FE0E94}</ProjectGuid>
    <ProjectName>local_thr</ProjectName>
@ -56,16 +56,12 @@
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup>
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2013/remote_lat/remote_lat.props
+++ b/builds/msvc/vs2013/remote_lat/remote_lat.props
@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>    
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(SolutionDir)libzmq.import.props" />
-    <Import Project="$(SolutionDir)libsodium.import.props" />
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <Linkage-libsodium>static</Linkage-libsodium>
-  </PropertyGroup>  
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
-  </Target>
-
-</Project>
--- a/builds/msvc/vs2013/remote_lat/remote_lat.vcxproj
+++ b/builds/msvc/vs2013/remote_lat/remote_lat.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}</ProjectGuid>
    <ProjectName>remote_lat</ProjectName>
@ -56,16 +56,12 @@
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup> 
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/builds/msvc/vs2013/remote_thr/remote_thr.vcxproj
+++ b/builds/msvc/vs2013/remote_thr/remote_thr.vcxproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{B15E059C-0CBB-4A82-8C42-6567FB650802}</ProjectGuid>
    <ProjectName>remote_thr</ProjectName>
@ -61,7 +61,7 @@
  <ImportGroup Label="PropertySheets">
    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
+    <Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
  </ImportGroup>  
  <ItemGroup>
    <ClInclude Include="..\..\platform.hpp" />
--- a/Show More
+++ b/Show More