Fix to the bi-directional helper functions.
Updated 3.3.014
Merge branch 'master' into develop

Conflicts:
	version.txt