Add namespace to make this plugin work with trunk