Linkify the correct stuff

This was duplicating the description.
Merge remote-tracking branch 'upstream/seven-year-itch' into seven-year-itch