Update to new versions of vendor software and correct build logic.

(0) -1 +1 +10 +30 +100 +300 tip

mercurial