Merge pull request #5327 from colemanw/totten-master-headerlist