Merge pull request #2920 from xypron/relayctl