Merge remote-tracking branch 'upstream/master'

diff --cc website/reverse.php
index 3f062f46bff8b870eaff8a4194cb0990dea89f24,93cb58771cd3ad68df10ab6ec50798e4102bd77d..d70a11e9e2a1a0f3639711f9522273a5865bab5a
--- 1/website/reverse.php
--- 2/website/reverse.php
+++ b/website/reverse.php
@@@ -47,9 -57,11 +45,13 @@@
  
                $aPlace = $oReverseGeocode->lookup();
        }
+       else
+       {
+               $aPlace = null;
+       }
  
 +      logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
 +
        if (CONST_Debug) exit;
  
        include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');