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