master: 852bb079ddee25a04ecc929a370be728a35c4d3d Merge fix for gitlog