Merge remote-tracking branch 'upstream/master'

diff --cc lib/Geocode.php
index acd2f76cca713e6c1ab98f79deae0972dee3587e,b9e26f0381dc9aef3055ebcdc28a8ffd15b637df..598306235867e8afc7137241ef265f4353f321d9
--- 1/lib/Geocode.php
--- 2/lib/Geocode.php
+++ b/lib/Geocode.php
@@@ -17,10 -17,8 +17,8 @@@ class Geocod
  
      protected $aLangPrefOrder = array();
  
-     protected $bIncludeAddressDetails = false;
- 
      protected $aExcludePlaceIDs = array();
 -    protected $bReverseInPlan = false;
 +    protected $bReverseInPlan = true;
  
      protected $iLimit = 20;
      protected $iFinalLimit = 10;

diff --cc lib/lib.php
Simple merge

diff --cc website/reverse.php
Simple merge