Merge pull request #5363 from MikePetullo/grilo