Exports are now getting their position in the source code.
Merge branch 'master' into timing