changed marshalling of inet addresses to restrict them to either 4 or 16 byte representations to remove extraneous bytes
Merge remote-tracking branch 'upstream/master'
re-synced fork with master
Merge pull request #244 from dankennedy/master

Change marshalling of inet addresses to restrict them to either 4 or 16 bytes