am a3d25d74: Merge "Fix context leak"

* commit 'a3d25d7489d7e071fb6db01b62ec9d925e1d493d':
  Fix context leak