Merge branch 'master' into fix23-telnettimeout
Merged stash into fix23-telnettimeout
fix extraneous merge issues
Merge pull request #28 from kdmurray91/fix23-telnettimeout

Fix23 telnettimeout