Hotfix for incorrect table names, and optimized prefix for Oracle
support.
Updated Version 3.1.6
Merge branch 'master' into develop

Conflicts:
	version.txt