master c1
b2c1
b1c1
b2c1
(cherry picked from commit 4cb2f42)
Merge branch 'master' into b2

Conflicts:
	lib/simplegit.rb
Merge branch 'master' into b2

Conflicts:
	lib/simplegit.rb
master c2