Merge remote-tracking branch 'upstream/master'

Conflicts:
	sql/functions.sql
	sql/tables.sql

diff --cc sql/functions.sql
Simple merge

diff --cc sql/tables.sql
index 428eadc2d7c2c8d950532944fcd19b476afcad35,9126c6299e35b1e50986ff137ba350bc073828fe..dcee40700036bcc07707a60e988f9e66fd1da444
--- 1/sql/tables.sql
--- 2/sql/tables.sql
+++ b/sql/tables.sql
@@@ -41,7 -53,12 +41,9 @@@ GRANT INSERT ON new_query_log TO "{www-
  GRANT UPDATE ON new_query_log TO "{www-user}" ;
  GRANT SELECT ON new_query_log TO "{www-user}" ;
  
+ GRANT SELECT ON TABLE country_name TO "{www-user}";
+ GRANT SELECT ON TABLE gb_postcode TO "{www-user}";
  
 -create view vw_search_query_log as SELECT substr(query, 1, 50) AS query, starttime, endtime - starttime AS duration, substr(useragent, 1, 20) as 
 -useragent, language, results, ipaddress FROM new_query_log WHERE type = 'search' ORDER BY starttime DESC;
 -
  drop table IF EXISTS word;
  CREATE TABLE word (
    word_id INTEGER,