Don't free memory that we still need (albeit only briefly).
Merge remote-tracking branch 'upstream/master'