Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	homeassistant/const.py
This commit is contained in:
Paulus Schoutsen 2016-05-19 22:32:34 -07:00
commit 32f97dc578

Diff Content Not Available