Fix for necessity check to work now
Merge remote-tracking branch 'origin/master'

Conflicts:
	general.py