make upgrade
Fix a few release nits