Fixed Issue #1592
Merge pull request #1595 from svahn/develop

Fixed Issue #1592