Merge remote-tracking branch 'upstream/master'

diff --cc lib/Geocode.php
index 2d5d33944e640a7b0fa92bfc6bb028ae84dc68bb,bb06704645ba88196c8a771489107091ce6bc364..c79dcf1ea5d41e49af50b7c0cbd4168af264c28d
--- 1/lib/Geocode.php
--- 2/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -1651,10 -1660,8 +1666,9 @@@
                                                        {
                                                                preg_match_all('/(-?[0-9.]+) (-?[0-9.]+)/',$aMatch[1],$aPolyPoints,PREG_SET_ORDER);
                                                        }
 +                            */
                                                        elseif (preg_match('#POINT\\((-?[0-9.]+) (-?[0-9.]+)\\)#',$aPointPolygon['astext'],$aMatch))
                                                        {
-                                                               $fRadius = 0.01;
                                                                $iSteps = ($fRadius * 40000)^2;
                                                                $fStepSize = (2*pi())/$iSteps;
                                                                $aPolyPoints = array();

diff --cc settings/settings.php
Simple merge

diff --cc sql/tables.sql
Simple merge