some of Muthu's comments integrated, and a bit more tweaking
Merge branch 'master' of https://github.com/Draft-Mafia/IETF-drafts