Editor's drafts for chris-wood-patch-1 branch of chris-wood/draft-pqpake