- String comparison fixes
Merge branch 'master' into refactoring

Conflicts:
	elementary_fixes.py