Merge remote-tracking branch 'remotes/download13/master' -- no need for zaach#352 as we now use a different mark-and-strip approach, which does not use JS labels anymore at all. Thus flagged as processed.

# Conflicts:
#	lib/jison.js

Author: GerHobbelt