Removed grammar.h
Merge with Trunk Revision 10794.
Merge conflict resolved.