Merge branch 'fix-forward-port' into 'master'

Fix the forward ssh port, we already set it, so we cannot use //=

See merge request !26