Merge pull request #6010 from home-assistant/merge-master

Merge master
This commit is contained in:
Paulus Schoutsen
2017-02-14 21:55:30 -08:00
committed by GitHub

Diff Content Not Available