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

* commit '4ab20cdff7afc2c019f861593eb955ceaedab10e':
  Fix segfault when destroying context