Avoid loading unused Grunt tasks
Better error messages for unbound resolver
Merge branch 'benjamingr-patch-4'