Merge changes for CSV Writer excel compatibility from 1.x develop branch