don't use --short, it's only on newer Gits
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'