Fix for Jira AUT-1176.
Merge pull request #325 from alexjacks92/develop

Fix for Jira AUT-1176.