Imported fix for annotations and external variables from sausalito
Added changes to pregenerated files.
Merge pull request #45 from 28msec/fix-annotations-and-external-variables

Imported fix for annotations and external variables from sausalito