Merge
Merge branch 'Bug428195' of https://github.com/OLibutzki/smarthome into Bug428195