merge commit '966ad42cee3de834a8223ac89f15c32972e1abd3'
merge commit '966ad42cee3de834a8223ac89f15c32972e1abd3'

ottok/mariadb-connector-c,MariaDB/mariadb-connector-c,ottok/mariadb-connector-c,ottok/mariadb-connector-c,MariaDB/mariadb-connector-c,MariaDB/mariadb-connector-c