Bumping version up to 3.5.0 with the merges.