Merge pull request #3938 from stintel/domoticz