#206 merge mariadb 10.0.11 changes