Fix for #2718 and #2766 [needs backport]

git-svn-id: http://dev.geogebra.org/svn/trunk/geogebra@22913 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
bugfix: circles not recognized

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