Merging Cecil grammar with master branch

sa10g10 & cf4g09