Merge in changes from the 1.1 branch.