Merge branch 'gitbuild'