Manually merge https://github.com/mirage/irmin/pull/67