Merge branch 'master', remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fix --with-libsodium include flags for czmq issue #387.

Also fix apparent typo in --with-libzmq error message ("czmq" instead of
"jzmq").
Merge pull request #419 from mjhowell/master

Fix --with-libsodium include flags for czmq issue #387