Changed to match updated AsioService.
Merge branch 'next' into relay_message_fix