Merge fix for gitlog