Merge pull request #1813 from MikePetullo/grilo-plugins