BUGFIX: Can't cast String to Integer
Merge branch 'feature-portforwarding-with-a-twist' into srf-master