Change-tracked updates per-discussion
No change, except tracked changes accepted

And I-D reformatted.  Plus PDF.