bbondy wants to merge 1 commit into master from no-shrinkwrap