MariaDB is relational, not non-relational
Merge branch 'master' into gh-pages