Merge pull request #1 from studer-raimann/develop

Bugfixes
Merge branch 'release/3.0.3'
Merge commit '267540e3c221ac4bc5d00031f26d139cdfb5881a'