Merge branch 'master' of https://github.com/vyta/GitMergePt2 into test
Merge branch 'master' of https://github.com/vyta/GitMergePt2