SWC-650
Merge pull request #365 from jay-hodgson/release-y

SWC-650