Merge pull request #1080 from shackbarth/unspork