SOAP-525 Fixed text display problems (NOTE: not tested on Windows yet!)
Merge branch 'SOAP-525' into easy-rest-project-SOAP-342