Marshaling and un-marshaling of wiki links in comments.
I accidentally checked into sprint4-design.

It was deleted, so the previous checkin created it, and now I am merging
it back into sprint4 (minor checkin related to comments on it) and then
deleting the branch.  And moving subsequent checkins over to sprint4.

Merge branch 'sprint4-design' into sprint4

* sprint4-design:
  Marshaling and un-marshaling of wiki links in comments.