Merge branch 'master' of /home_local/workspaces/git/bobcat with conflicts.
test git 2