Merge branch 'travis_mariadb'