Upgrade to package-generator@0.31