Merge pull request #6363 from dwmw2/domoticz-18.06
authorStijn Tintel <stijn@linux-ipv6.be>
Tue, 26 Jun 2018 22:15:29 +0000 (00:15 +0200)
committerGitHub <noreply@github.com>
Tue, 26 Jun 2018 22:15:29 +0000 (00:15 +0200)
Domoticz update for 18.06


Trivial merge