Merge pull request #1120 from jay-hodgson/release-54

SWC-1633