b1
Merge branch 'master' of https://github.com/dickerpulli/git.git into b1
Merge branch 'master' of https://github.com/dickerpulli/git.git

Conflicts:
	test/src/main/java/test/Strings.java