Merge branch 'patches/marcus/stripchart'