pid
Merge remote-tracking branch 'pivot/master'

Conflicts:
	iminsigihumbi.py