Fixes bug with custom file attributes
Updated Version 3.5.021
Merge branch 'master' into develop

Conflicts:
	version.txt