Fix build on OS X, complains about variable length array folded to constant array.
Rename ZSOCK_MAX_FRAMES to ZSOCK_BSEND_MAX_FRAMES for clarity. Bring back the previous comment.
Problem: zbeacon.c doesn't use self->poller
Solution: Remove self->poller
Fixes #794
Implemented ZeroMQ RFC 32 Z85 mode in zarmour class.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/zarmour.c
Merge remote-tracking branch 'upstream/master'
Fixed merge error.
Merge pull request #849 from lovmoen/master

Problem: zarmour does not support Z85