Merge pull request #1867 from MikePetullo/lcdgrilo