[pull] dev from home-assistant:dev #1496
+72
−11
Merged
Loading