Merge branch 'master' into old

Conflicts:
	.gitignore