Merge pull request #389 from lowell80/master

Replaced RFC 2271 with 2217 in docs & comments