4.5
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/src/test/main.java