Merge pull request #1005 from shackbarth/21867