Issue #2019 fix. Tied labels to their respective controls
Updated Version 3.1.58
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into develop-3_3

Conflicts:
	version.txt