Merge pull request #7985 from PeterFromSweden/telldus