Merge branch 'master' into dev

Conflicts:
	homeassistant/const.py
This commit is contained in:
Paulus Schoutsen 2016-07-12 22:31:54 -07:00
commit 3dcafafc6a

Diff Content Not Available