Merge branch 'master' into jsoverson-merge

Conflicts:
	.gitignore