Merge pull request #6820 from notnyt/update_cshark