Maintenance for 1.3
Merge branch 'v1_maintenance' into dev

Conflicts:
	MyCode.cpp