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

Conflicts:
	homeassistant/const.py
This commit is contained in:
Paulus Schoutsen 2016-06-07 19:27:23 -07:00
commit 31489a56db

Diff Content Not Available