Fix PluginGenerator errors in case of assisted injection
Merge remote-tracking branch 'origin/gwt' into gwt