Merge "added support for git.server"