Version bump, drop some patches which are now included