Pull in the memory management code from other peoples forks