Issue 1398 - Improve compatibility with older git(1) versions