Implement: Test type 6: Plaintext
PR #655 - Add some improvements as in PR #636 (Grizzly)
Merge branch 'master' into plaintext
Merge pull request #655 from martin-g/plaintext

Wicket: implement "Test type 6: Plaintext"