Updates to latest Sufia from canonical repo/branch.