Ticket #3065: more changes applied from the patch, still OK

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@24941 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Ticket #3065: still commiting parts of the patch (a bit modified), still OK

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