Merge pull request #2807 from akoeplinger/gchandle