Merge pull request #2847 from MikePetullo/lcdgrilo