Merge in upstream changes and massage packages to fit