Attempt to implement changes for #2942


git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@22950 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Reverting [22746] since it breaks file loading with *Botana methods


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


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


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