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