Thanks for reporting that bug. To fix it, I installed the attached patch into 
grep master on Savannah.