Merge pull request #3749 from Ansuel/fix_relayd