Maintenance for 1.3
Merge branch 'v1_maintenance' into dev

Conflicts:
	MyCode.cpp
Revert "Quick feature 10 fix"

This reverts commit 3062a63d64215c4d6a4c996ab006508f36c7adb7.
Added new code
Merge commit '57e671cfd5e77a87d52878a981e5f6ec9ed1bd2d' into 4.0_beta

Conflicts:
	MyCode.cpp
Merge branch '4.0_beta' into dev