Merge pull request #4687 from annando/fix-relay