Merge branch 'master' into tags_new

Conflicts:
	.gitignore