Merge of 0.13 changes and implof ipv6 support for configuration