BUGFIX: must finish line even when it's not on the screen
Merge branch 'feature-portforwarding-with-a-twist' into srf-master