Support newer git versions