Attempt to auto-accept return items when received.
Fixes #5130
Update gem options to Ruby 1.9 syntax

:lipstick:

Fixes #5134
Fix broken specs.