Updated minor some files.
U.
Merge branch 'develop'
Merge branch 'master' into release-support

Conflicts:
	.gitignore
Merged.