Pick up recent changes that include support for latest Metacello release