Merge "Add vcs string to version option output"