Minor changes in syntax/comments.
ASSERTing in case of invalid inheritance relation changes
Merge branch 'autorouter_port'
Merge branch 'master' into demo