Merge pull request #2986 from xypron/relayctl