Merge remote-tracking branch 'upstream/master'

diff --combined sql/functions.sql
index c9797a5c93eef9ad66a85c2fb4c69e6e5a903c1d,ada9fb50007c0d4577efa04442681488b1eb54e9..18ce50dc61b22ade61f067fbab7ad8a41d48b9c7
--- 1/sql/functions.sql
--- 2/sql/functions.sql
+++ b/sql/functions.sql
@@@ -35,7 -35,7 +35,7 @@@ CREATE OR REPLACE FUNCTION make_standar
  DECLARE
    o TEXT;
  BEGIN
-   o := gettokenstring(transliteration(name));
+   o := public.gettokenstring(public.transliteration(name));
    RETURN trim(substr(o,1,length(o)));
  END;
  $$
@@@ -2462,7 -2462,7 +2462,7 @@@ BEGI
      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)