Merge from upstream to get bottleneck and scatterplot changes.

Perhaps scatterplot won't merge cleanly.