Return resource objects with parameters instead of an array with the name of the resource.
Merge remote-tracking branch 'origin/master'