SWC-369: merge change up from develop
Merge pull request #187 from jay-hodgson/release-1.18

SWC-369: merge change up from develop