Merge pull request #1194 from shackbarth/22394