Return the argument passed to the callback in a deferred callback, otherwise twisted will replace the deferred result with 'None'
Merge branch 'hotfixes-v0.6.0a'