Merge branch 'pw/git-p4-tests'