Pull in fixes from mhess-connectify/mariadb55