Updated Cecil from upstream.