Merge "Allow plugin names to contain non-letter characters"