am 64d0e9d5: Merge "Fix segfault when destroying context"

* commit '64d0e9d5d4e3f446364e3b5c2bec34493c56e26e':
  Fix segfault when destroying context