Merge branch 'webgit2' into master