Merge in Herb's changes from 2.2.