SWC-651
Merge pull request #532 from brucehoff/release-2

SWC-651