Merge pull request #331 from poranje/proto=ipv6+aiccu+fixes