Fixed issue with splitting }; into separate tokens

Also backported: # 2.3.1 - 2013-12-12  -  Fixed issue with some #
detected as python comments when they where not