Merge pull request #1787 from Kenneth-T-Moore/csv

Cal's pull request - ready for release.
fix for release test failure