Merge branch 'fr_2.20_round3' of git://github.com/jnavila/git

Jiang Xin committed Dec 2, 2018 at 22:36 UTC a8f5329e043ac5fef231b17978f109020ca401ea

No changes.