Merge pull request #2945 from MikePetullo/grilo-plugins