BOY: fix https://github.com/ControlSystemStudio/cs-studio/issues/206
Merge pull request #207 from ControlSystemStudio/hotfixes

BOY: resolves #206