Master 3
Merge branch 'master' into br8

Conflicts:
	src/Test.java