Consolidating branches and bumping version #.