Merge pull request #1859 from shackbarth/1855