Merge pull from jmcnamara/XlsxWriter