[pull] dev from home-assistant:dev #1371
+799
−948
Merged
Loading