Merge branch 'develop' into debian/sid

diff --cc .gitignore
index aad43ead03ff659e736fdad5d0564615ef4a1229,99cef6d04b143a7aa3fc5e918fcd1780f0866722..67e4bddf2f94f0937a7eef51739623428b7f87a3
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -55,6 -56,8 +56,9 @@@ tests/getsqlfromhashtabl
  tests/sqlbuilder
  tests/metastore
  *~
 +build/
  *.gir
  *.typelib
 -*.csv
+ tools/*.exe
+ tools/gdaex_exp_csv
++*.csv