Bring up to speed with current master repo