Merge remote branch 'remotes/mathrick/gvalue-fix'