avoid inadvetently updating global dict of headers
Merge remote-tracking branch 'upstream/master'