Merge changes from bug 1100817.