Merge remote-tracking branch 'marvin/master'

Conflicts:
	iminsigihumbi.py
Merge remote-tracking branch 'pivot/master'

Conflicts:
	iminsigihumbi.py
Merge remote-tracking branch 'marvin/master'
Coming up to date.
Transfers and failures.