Merge remote-tracking branch 'origin/US03-JG' into US03-JM

Conflicts:
	pyCommander.py
	pyCommander.pyc