Merge remote-tracking branch 'origin/master'

Conflicts:
	antlr4/T.dat
	antlr4/pyLexer.pyc
	antlr4/pyListener.pyc
	antlr4/pyParser.pyc
	antlr4/tout.txt
	antlr4/tree.pyc