Merge remote-tracking branch 'upstream/master' into create_project-xcode

Conflicts:
	.gitignore
	devtools/create_project/create_project.h