Merge branch 'new-plots'
Merge branch 'master' into new-plots
Revert "Merge branch 'master' into new-plots"

This reverts commit 3473fbcbaf62f0858a594ba6f073251355fb6f9a, reversing
changes made to c7b5d80ea15e9b4189a405cd8c39c8e7cd6b693f.