Merge in all changes from the next branch now that the release is out.