Merge pull request #1858 from shackbarth/1854