Manually replaying changes.
Merge pull request #770 from cschroed-usgs/CCH-1092-1

Manually replaying changes.