Fixed grammar bug
Merge remote-tracking branch 'upstream/master'

Conflicts:
	icons.py
	sdl92Lexer.py
	sdl92Parser.py