Closes #1763 & Closes #1764
Merge branch 'hotfix'

sage aborts
Updated Version 3.0.6
Merge branch 'master' into develop

Conflicts:
	version.txt