Merge commit '683d39b04949981c55629d6e1344246a94df638b'

Conflicts:
	scripts/git-up.py
	scripts/git.py