Merge origin/Testing into Testing

Conflicts:
	test/testing/TestingIT.java