upstream release Thanks to Matthieu Valleton for contributing a patch to restore MariaDB compatibility