Merge pull request #1457 from evincarofautumn/weak-refs