Fixing bugs from connections
Merge branch 'master' of https://github.com/Gatopo/router-cc8