Merge pull request #795 from vincentbernat/fix/libstatgrab