fix #1841
Merge branch 'master' of github.com:domogik/domogik