Merge pull request #348 from akru/cjdns-v20.1