version bump for all of the recent merges