Merge pull request #951 from TheBlueMatt/headerslimit