am 425587d2: Merge "Use va_list argument to abort transaction"

* commit '425587d25832145a45a0b76beaa93996b0226f0d':
  Use va_list argument to abort transaction