Fix for issue #2090
Merge pull request #2093 from erwinwinder/master

Fix for issue #2090