Fix weakvaluereference.h
Merge branch 'master' into fix-leak