Merge remote-tracking branch 'origin/master' into cana

Conflicts:
	.gitconfig