[pull] dev from home-assistant:dev #1532
+16
−12
Merged
Loading