swc-1113 logging
Merge pull request #935 from dburdick/release-24

swc-1113 logging