Support older versions of
MySQL
auto-merge staging into master