Merge branch 'develop' into debian/sid

diff --cc .gitignore
index 697da3e70807d45673d6cd445dc1decfe2232a36,f64b833300ad9df9402068dc707f5100f8c59ef0..061212858f6eddb745f391e975b6d1acd380f09d
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -58,9 -58,9 +58,10 @@@ tests/getsq
  tests/getsqlfromhashtable
  tests/getsqlfromjson
  tests/sqlbuilder
+ tests/sqlbuilder_macro
  tests/metastore
  *~
 +build/
  *.gir
  *.typelib
  tools/*.exe