Merge branch 'ld/git-p4-expanded-keywords' into next