Merge pull request #400 from Masterminds/feat/vcs-1.6.1

Updating to VCS 1.6.1