Merge remote-tracking branch 'upstream/master'

diff --cc lib/Geocode.php
Simple merge

diff --cc sql/functions.sql
index 54b28ce7a88e20239e925dbbaaca16eea7aa03e4,f4be01e2d03bd9543f4bf6b2990657d5ed0f2d96..1c39c1fc173cb57bb12ebc34a7eb3039f180f1cb
--- 1/sql/functions.sql
--- 2/sql/functions.sql
+++ b/sql/functions.sql
@@@ -2424,9 -2370,9 +2370,9 @@@ BEGI
        CASE WHEN class = 'place' and type = 'postcode' THEN hstore('name', postcode) ELSE name END as 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,calculated_country_code,postcode
+       distance,country_code,postcode
        from place_addressline join placex on (address_place_id = placex.place_id) 
        where place_addressline.place_id = for_place_id 
        and (cached_rank_address > 0 AND cached_rank_address < searchrankaddress)