Merge remote-tracking branch 'upstream/master'

diff --cc lib/Geocode.php
Simple merge

diff --cc lib/lib.php
Simple merge

diff --cc sql/functions.sql
index e00c97a2e985764223b1e3ce7da314de649dd7bc,a9bca5423dc03d327c3cccbd6d20cb3df4e61a65..820bdbf8a3390291a1352ab4203875c1510e368a
--- 1/sql/functions.sql
--- 2/sql/functions.sql
+++ b/sql/functions.sql
@@@ -2432,11 -2500,10 +2500,10 @@@ BEGI
    END LOOP;
  
    FOR location IN 
-     select placex.place_id, osm_type, osm_id,
-       CASE WHEN class = 'place' and type = 'postcode' THEN hstore('name', postcode) ELSE name END as name,
+     select placex.place_id, osm_type, osm_id, name,
        CASE WHEN extratags ? 'place' THEN 'place' ELSE class END as class,
        CASE WHEN extratags ? 'place' THEN extratags->'place' ELSE type END as type,
 -      admin_level, fromarea, isaddress,
 +      admin_level, fromarea, isaddress and linked_place_id is NULL as isaddress,
        CASE WHEN address_place_id = for_place_id AND rank_address = 0 THEN 100 WHEN rank_address = 11 THEN 5 ELSE rank_address END as rank_address,
        distance,country_code,postcode
        from place_addressline join placex on (address_place_id = placex.place_id)