Master 4
Merge remote-tracking branch 'origin/br8' into br8

Conflicts:
	src/Test.java