Simpy grammar change.
Merge branch 'grammar-fix-2014-2-20'