Lets Git temporarily cache HTTPS credentials.
Merge branch 'master' into osx
Lets Git normalize line endings.
Merge branch 'master' into osx

Conflicts:
	.gitconfig