Fix for JIRA GDP-830
Merge pull request #141 from prusso-sse/master

Fix for JIRA GDP-830