Merge branch 'master' into mac

Conflicts:
	.gitignore