Sync with latest net.anastigmatix.Packager