Resolve merge conflicts in pull request #756
Resolve merge conflicts in pull request #756

Original commit: 33d95de99c218df46608854a95907a665108ac34
Pull request: https://github.com/ioBroker/ioBroker.repositories/pull/756

ioBroker/ioBroker.repositories,ioBroker/ioBroker.repositories