Twisted Deferred errback method takes an Exception instead of a string
Merge branch 'master' into agent