Merge commit '92600d29833b59f7df779e7e0b510df7f9d17d31'

Conflicts:
	git-tools/__init__.py
Merge commit 'd2b5ae622a50c5be2a36f139f6680b84b98fe281'