fix bug when trying to resolve for no plugins
Merge remote-tracking branch 'origin'
fix /reload