am 70bf0698: (-s ours) am b20b0629: am 71dfc7e9: Merge "Memory leak in parsePackage"

* commit '70bf06986a90c21137fc4836aa0e56d68a2ab588':
  Memory leak in parsePackage