Posted -03 version
Merge branch 'master' of https://github.com/hlflanagan/draft-flanagan-plaintext

Conflicts:
	draft-flanagan-plaintext-03.xml