Sync with recent git code.