Fix https://github.com/CitoyensCapteurs/CitizenWatt-Base/issues/17
Merge branch 'dev' into debian