Merge upstream/master

Conflicts:
	.gitignore