Merge branch 'master' into dev

Conflicts:
	homeassistant/const.py
This commit is contained in:
Paulus Schoutsen 2016-06-27 23:26:46 -07:00
commit d0b9b588a9

Diff Content Not Available