Merge remote-tracking branch 'origin/1.3.x-codeborne' into 1.3.x-codeborne

Conflicts:
	framework/src/play/utils/Java.java
Merge remote-tracking branch 'origin/1.3.x-codeborne' into 1.3.x-codeborne