Reverting commit c5b9bb9 (which broke longer headers)
Merge remote-tracking branch 'singlebrook/master'