Master1
Merge branch 'br8'
Master 2
Revert "br8-1,2"

This reverts commit 1af19b48073ccdfa420774b509adba919f4b32ab.
Merge branch 'master' into br8

Conflicts:
	src/Test.java
br8-4