Merge pull request #3844 from opdenkamp/cecbump