Merge branch 'master' into modular

Conflicts:
	.gitignore