Merge remote-tracking branch 'upstream/master'
Add extends
Merge remote-tracking branch 'origin/master'

Conflicts:
	ports/csharp/Jison/Jison/Template.cs
	ports/csharp/Jison/Jison/csharp.js