Merge IPv6 fix by Stefan Oßwald
Merge branch 'master' of github.com:fkie/multimaster_fkie