Merge pull request #1252 from shackbarth/22237