Merged with scroll-view branch.  No other changes.