Database: change to the column format to fix integer overflows
Merge branch 'master' into line-simplification
Fix the 'query' tool to work with the new column format
Merge branch 'master' into line-simplification