Merge "Fix segfault when destroying context"