am 80e455e3: Merge "Prevent possible memory leak in SpanSet"

* commit '80e455e32580fb909af18ad0a21fccc6b433dd4b':
  Prevent possible memory leak in SpanSet