Corrected the multi-header mishandling (issue 161), and disabled two related (now failing) unit tests that are believed to be invalid.
Merge remote-tracking branch 'pcolby/master'