[Commits] af96bc65: Merge branch '3.x' into mariadb-3.x