Summary of changes: 815006a... - Added a workaround to really support MariaDB (#995870) - (*) 2e23aec... Merge remote branch 'origin/master' into el6 (*) This commit already existed in another branch; no separate mail sent