Bumping version after master-merge.