Merge branch 'master' into wttek

Conflicts:
	src/Test.java