Merge branch 'develop'

Conflicts:
	os2web.make
Merge fix. Merge release-1.12
Mobile version
Merge branch 'release-1.13' into develop