Merge some of the v14 changes

Hey Ken,

We fixed some of the Rock v14 errors in the CSV branch but hadn't pushed it until this morning.  You'll need to accept this pull request so you have the updated code.