Merge pull request #499 from jay-hodgson/release-8

SWC-774: merge from release-7
SWC-778: use a span instead of an anchor, and style the span