Some minor changes and added refference to RFC2732#116

jenslink wants to merge 3 commits intobecarpenter:mainbecarpenter/book6:mainfrom

jenslink:mainjenslink/book6:mainCopy head branch name to clipboard