1132458 - cont - test now works outside of terminal
Merge pull request #1221 from asmacdo/1132458-test-no-terminal

1132458 - cont - test now works outside of terminal
Merge branch '2.5-dev'