chomp the branch name so we do not get a stray carriage-return
be more miserly about disk space
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'