Merge pull request #1620 from shackbarth/shrinkwrap