Misc syntax issues.
Merge branch 'autorouter_port'
Merge branch 'master' into demo