Merge branch 'master' into release
Version to 2.11
Merge branch 'release'
Merge branch 'master' into data_beta

Conflicts:
	build.xml