Changed: Merged somfy-fix into Master