Merge pull request #4023 from danrl/cshark