Merge branch 'OD-IBO-SUPP-2088' into test

Conflicts:
	testprj/src/testprj/FileWriter.java
	testprj/src/testprj/Tester.java
Merge branch 'test'