Changed MySQL connector to MariaDB
Merge origin/master