- rel 2; add fixes from upstream git