Add git push.default = current
Merge branch 'master' into imo-dell

Use git push.default = current

Conflicts:
	.gitconfig