Add some comments.
Merge remote-tracking branch 'origin/master'

Conflicts:
	toolchainbot.py