Minor adjustment in order to make dashstyle hack work on columns
Merge remote-tracking branch 'upstream/master'