Fix bug in new TempBuffer code.
Merge branch 'master' into glinject-next