Added Chris W Piker at Len Garcia's request
Merge branch 'master' of https://github.com/hpde/draft-SMWG