Attempt to match html anchors (which github strips out) with the ones github generates.
Merge remote-tracking branch 'upstream/master' into topical_branch