Work around bug #1643
Work around bug #1644
Merge pull request #2025 from GPCsolutions/dbupgrade

Work around tms bugs with MariaDB