tracking changes in master

https://github.com/nanomsg/nanomsg/commit/7008259845cea8305562911263be57
d6941e4c6c