Merge pull request #50 from danw/multistage-pkgfix

Fix bootstrap package build stage default