Complete consolidation [#389]
Merge branch 'master' of github.com:SOLA-FAO/database