Additional Hotfix for issues with Oracle Reporting Framework.
Merge branch 'master' into hotfix
Updated Version 3.1.4
Merge branch 'master' into develop

Conflicts:
	version.txt