Prune DDL from schema.sql
Merge branch 'master' into i18n