Merge remote-tracking branch 'upstream/master'

Conflicts:
	website/reverse.php
	website/search.php

diff --cc lib/Geocode.php
Simple merge

diff --cc lib/lib.php
Simple merge

diff --cc settings/settings.php
Simple merge

diff --cc tests/features/api/search_params.feature
Simple merge

diff --cc tests/features/api/search_simple.feature
Simple merge

diff --cc utils/setup.php
Simple merge

diff --cc website/reverse.php
index d70a11e9e2a1a0f3639711f9522273a5865bab5a,abc33a09ed297e382cc1d3862fc8147badc63e6f..ee2fa475a308380f616cf0aa92117eeb1ad5f902
--- 1/website/reverse.php
--- 2/website/reverse.php
+++ b/website/reverse.php
@@@ -50,8 -69,11 +57,12 @@@
                $aPlace = null;
        }
  
 +      logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
  
-       if (CONST_Debug) exit;
+       if (CONST_Debug)
+       {
+               var_dump($aPlace);
+               exit;
+       }
  
        include(CONST_BasePath.'/lib/template/address-'.$sOutputFormat.'.php');