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

Merge master
pull/6014/head
Paulus Schoutsen 2017-02-14 21:55:30 -08:00 committed by GitHub
commit c1988acb36

Diff Content Not Available