FIX: Escape underscore in values for gnuplot.
Merge branch 'feature-3' into release-1.6.0