Revert "Merge remote-tracking branch 'pivot/master'"

This reverts commit 183f8d364f4e4a942b4a69c9d3f84fa1d14e37c7, reversing
changes made to a8e7aff17bd33ec45abcef9f72e449e8620fc545.
Revert "Merge remote-tracking branch 'pivot/master'"

This reverts commit e98ad50a32be6141855eac5b7ef17d205d744e01, reversing
changes made to a9071ec08cbde0eab266c1066cfefee36de65e49.

Conflicts:
	iminsigihumbi.py