SWC-375
Merge pull request #191 from brucehoff/develop

SWC-375