Merge remote-tracking branch 'upstream/master'

diff --cc sql/functions/address_lookup.sql
index daed3a8b5e3d6dcbc7a41c744dca3b438e030533,55fa23f277c175085d4befa6b117386578e40cd7..7e8a9ecda967e95a22f5d1ff590767a6ca68c2c8
--- 1/sql/functions/address_lookup.sql
--- 2/sql/functions/address_lookup.sql
+++ b/sql/functions/address_lookup.sql
@@@ -207,8 -207,8 +207,8 @@@ BEGI
  
    FOR location IN
      SELECT placex.place_id, osm_type, osm_id, name, class, type,
-            coalesce(extratags->'place', extratags->'linked_place') as place_type,
+            coalesce(extratags->'linked_place', extratags->'place') as place_type,
 -           admin_level, fromarea, isaddress,
 +           admin_level, fromarea, isaddress and linked_place_id is NULL as isaddress,
             CASE 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)