Fixes parsing of column headers with single quotes.
Merge branch 'brandon-fixes'

* brandon-fixes:
  Fixes parsing of column headers with single quotes.