am bad60996: Merge "correct erroneous double free"

* commit 'bad609967800da161417f9767fc0d1814a2d0259':
  correct erroneous double free