Merge pull request #2955 from xypron/relayctl