Include changes from https://github.com/doctrine/dbal/pull/687