Use 'default' plotting method
Merge remote-tracking branch 'devel/355-plot-axis-test-failing' into devel-master