Merge tag 'v2.10.4' into maint-2.11

Git 2.10.4

diff --cc cache.h
Simple merge

diff --cc connect.c
Simple merge

diff --cc path.c
Simple merge