b4-1
b4-2
b4-3
Merge branch 'master' into br4

Conflicts:
	src/Test.java