Merge pull request #4863 from home-assistant/master

Backmerge point releases
This commit is contained in:
Paulus Schoutsen 2016-12-11 22:51:30 -08:00 committed by GitHub
commit d51e62d0a3

Diff Content Not Available