am ab88b948: am 4ab20cdf: am 64d0e9d5: Merge "Fix segfault when destroying context"

* commit 'ab88b948527c8f5eb0368e6481155e21baf0add1':
  Fix segfault when destroying context