Updated: Text
Fixed: It's a server, not a plugin
Merge in master