SWC-363
Merge pull request #179 from jay-hodgson/develop

SWC-363