Merge remote-tracking branch 'origin/omar'

Conflicts:
	helpers.py
	helpers.pyc