Problem: Need doc generation and PR #15 has merge conflicts Solution: Merge as a patch by hand (with a few tweaks)
Problem: Need doc generation and PR #15 has merge conflicts
Solution: Merge as a patch by hand (with a few tweaks)

jemc/zproject,paddor/zproject,keent/zproject,paddor/zproject,keent/zproject,twhittock/zproject,zeromq/zproject,oikosdev/zproject,Asmod4n/zproject,awynne/zproject,awynne/zproject,taotetek/zproject,hintjens/zproject,asokoloski/zproject,mvala/zproject,taotetek/zproject,Asmod4n/zproject,taotetek/zproject,eburkitt/zproject,eburkitt/zproject,zeromq/zproject,asokoloski/zproject,jemc/zproject,miska/zproject,hintjens/zproject,trevorbernard/zproject,zeromq/zproject,paddor/zproject,mvala/zproject,twhittock/zproject