Merge in sjl's fork.