2.0 modiyeifd by 22
Merge remote-tracking branch 'origin/line2' into develop

Conflicts:
	script.py