Fix for #1810
Merge pull request #1824 from rgasch/patch-3

Fix for #1810