Merge to trunk from release branch:

Plug the leak that Tim just reported.
1 file changed