Ticket #4340: part of the patch that could be commited to Trunk immediately

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@34373 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e