diff --git a/.coveragerc b/.coveragerc
index 8d98a0c23e0..3f8d0e6959b 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -73,7 +73,8 @@ omit =
     homeassistant/components/comfoconnect.py
     homeassistant/components/*/comfoconnect.py
 
-    homeassistant/components/daikin.py
+    homeassistant/components/daikin/__init__.py
+    homeassistant/components/daikin/const.py
     homeassistant/components/*/daikin.py
 
     homeassistant/components/digital_ocean.py
@@ -105,18 +106,24 @@ omit =
     homeassistant/components/enocean.py
     homeassistant/components/*/enocean.py
 
-    homeassistant/components/envisalink.py
+    homeassistant/components/envisalink/__init__.py
     homeassistant/components/*/envisalink.py
 
     homeassistant/components/evohome.py
     homeassistant/components/*/evohome.py
 
+    homeassistant/components/freebox.py
+    homeassistant/components/*/freebox.py
+
     homeassistant/components/fritzbox.py
     homeassistant/components/*/fritzbox.py
 
     homeassistant/components/ecovacs.py
     homeassistant/components/*/ecovacs.py
 
+    homeassistant/components/esphome/__init__.py
+    homeassistant/components/*/esphome.py
+
     homeassistant/components/eufy.py
     homeassistant/components/*/eufy.py
 
@@ -160,6 +167,9 @@ omit =
     homeassistant/components/homematicip_cloud.py
     homeassistant/components/*/homematicip_cloud.py
 
+    homeassistant/components/homeworks.py
+    homeassistant/components/*/homeworks.py
+
     homeassistant/components/huawei_lte.py
     homeassistant/components/*/huawei_lte.py
 
@@ -203,6 +213,9 @@ omit =
     homeassistant/components/lametric.py
     homeassistant/components/*/lametric.py
 
+    homeassistant/components/lcn.py
+    homeassistant/components/*/lcn.py
+
     homeassistant/components/linode.py
     homeassistant/components/*/linode.py
 
@@ -265,6 +278,9 @@ omit =
     homeassistant/components/openuv/__init__.py
     homeassistant/components/*/openuv.py
 
+    homeassistant/components/plum_lightpad.py
+    homeassistant/components/*/plum_lightpad.py
+
     homeassistant/components/pilight.py
     homeassistant/components/*/pilight.py
 
@@ -287,6 +303,8 @@ omit =
     homeassistant/components/raspihats.py
     homeassistant/components/*/raspihats.py
 
+    homeassistant/components/*/raspyrfm.py
+
     homeassistant/components/rfxtrx.py
     homeassistant/components/*/rfxtrx.py
 
@@ -407,6 +425,7 @@ omit =
 
     homeassistant/components/zha/__init__.py
     homeassistant/components/zha/const.py
+    homeassistant/components/zha/event.py
     homeassistant/components/zha/entities/*
     homeassistant/components/zha/helpers.py
     homeassistant/components/*/zha.py
@@ -423,6 +442,7 @@ omit =
     homeassistant/components/spider.py
     homeassistant/components/*/spider.py
 
+    homeassistant/components/air_quality/opensensemap.py
     homeassistant/components/alarm_control_panel/alarmdotcom.py
     homeassistant/components/alarm_control_panel/canary.py
     homeassistant/components/alarm_control_panel/concord232.py
@@ -496,7 +516,6 @@ omit =
     homeassistant/components/device_tracker/bt_smarthub.py
     homeassistant/components/device_tracker/cisco_ios.py
     homeassistant/components/device_tracker/ddwrt.py
-    homeassistant/components/device_tracker/freebox.py
     homeassistant/components/device_tracker/fritz.py
     homeassistant/components/device_tracker/google_maps.py
     homeassistant/components/device_tracker/googlehome.py
@@ -533,6 +552,7 @@ omit =
     homeassistant/components/folder_watcher.py
     homeassistant/components/foursquare.py
     homeassistant/components/goalfeed.py
+    homeassistant/components/idteck_prox.py
     homeassistant/components/ifttt.py
     homeassistant/components/image_processing/dlib_face_detect.py
     homeassistant/components/image_processing/dlib_face_identify.py
@@ -596,6 +616,7 @@ omit =
     homeassistant/components/media_player/frontier_silicon.py
     homeassistant/components/media_player/gpmdp.py
     homeassistant/components/media_player/gstreamer.py
+    homeassistant/components/media_player/harman_kardon_avr.py
     homeassistant/components/media_player/horizon.py
     homeassistant/components/media_player/itunes.py
     homeassistant/components/media_player/kodi.py
@@ -680,8 +701,10 @@ omit =
     homeassistant/components/route53.py
     homeassistant/components/scene/hunterdouglas_powerview.py
     homeassistant/components/scene/lifx_cloud.py
+    homeassistant/components/sensor/aftership.py
     homeassistant/components/sensor/airvisual.py
     homeassistant/components/sensor/alpha_vantage.py
+    homeassistant/components/sensor/ambient_station.py
     homeassistant/components/sensor/arest.py
     homeassistant/components/sensor/arwn.py
     homeassistant/components/sensor/bbox.py
@@ -692,6 +715,7 @@ omit =
     homeassistant/components/sensor/bme680.py
     homeassistant/components/sensor/bom.py
     homeassistant/components/sensor/broadlink.py
+    homeassistant/components/sensor/brottsplatskartan.py
     homeassistant/components/sensor/buienradar.py
     homeassistant/components/sensor/cert_expiry.py
     homeassistant/components/sensor/citybikes.py
@@ -737,6 +761,7 @@ omit =
     homeassistant/components/sensor/google_travel_time.py
     homeassistant/components/sensor/gpsd.py
     homeassistant/components/sensor/gtfs.py
+    homeassistant/components/sensor/gtt.py
     homeassistant/components/sensor/haveibeenpwned.py
     homeassistant/components/sensor/hp_ilo.py
     homeassistant/components/sensor/htu21d.py
@@ -752,6 +777,7 @@ omit =
     homeassistant/components/sensor/launch_library.py
     homeassistant/components/sensor/linky.py
     homeassistant/components/sensor/linux_battery.py
+    homeassistant/components/sensor/london_underground.py
     homeassistant/components/sensor/loopenergy.py
     homeassistant/components/sensor/luftdaten.py
     homeassistant/components/sensor/lyft.py
@@ -769,6 +795,7 @@ omit =
     homeassistant/components/sensor/netdata.py
     homeassistant/components/sensor/netdata_public.py
     homeassistant/components/sensor/neurio_energy.py
+    homeassistant/components/sensor/nmbs.py
     homeassistant/components/sensor/noaa_tides.py
     homeassistant/components/sensor/nsw_fuel_station.py
     homeassistant/components/sensor/nut.py
@@ -785,6 +812,7 @@ omit =
     homeassistant/components/sensor/pocketcasts.py
     homeassistant/components/sensor/pollen.py
     homeassistant/components/sensor/postnl.py
+    homeassistant/components/sensor/prezzibenzina.py
     homeassistant/components/sensor/pushbullet.py
     homeassistant/components/sensor/pvoutput.py
     homeassistant/components/sensor/pyload.py
@@ -809,6 +837,7 @@ omit =
     homeassistant/components/sensor/snmp.py
     homeassistant/components/sensor/sochain.py
     homeassistant/components/sensor/socialblade.py
+    homeassistant/components/sensor/solaredge.py
     homeassistant/components/sensor/sonarr.py
     homeassistant/components/sensor/speedtest.py
     homeassistant/components/sensor/spotcrime.py
@@ -864,6 +893,7 @@ omit =
     homeassistant/components/switch/mystrom.py
     homeassistant/components/switch/netio.py
     homeassistant/components/switch/orvibo.py
+    homeassistant/components/switch/pencom.py
     homeassistant/components/switch/pulseaudio_loopback.py
     homeassistant/components/switch/rainbird.py
     homeassistant/components/switch/rest.py
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 8772a136eb3..e58659c876a 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,7 @@
 <!-- READ THIS FIRST:
 - If you need additional help with this template please refer to https://www.home-assistant.io/help/reporting_issues/
 - Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/home-assistant/releases
+- Frontend issues should be submitted to the home-assistant-polymer repository: https://github.com/home-assistant/home-assistant-polymer/issues
 - Do not report issues for components if you are using custom components: files in <config-dir>/custom_components
 - This is for bugs only. Feature and enhancement requests should go in our community forum: https://community.home-assistant.io/c/feature-requests
 - Provide as many details as possible. Paste logs, configuration sample and code into the backticks. Do not delete any text from this template!
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index 2c418c6f63e..d9ab141d61c 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -7,6 +7,7 @@ about: Create a report to help us improve
 <!-- READ THIS FIRST:
 - If you need additional help with this template please refer to https://www.home-assistant.io/help/reporting_issues/
 - Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/home-assistant/releases
+- Frontend issues should be submitted to the home-assistant-polymer repository: https://github.com/home-assistant/home-assistant-polymer/issues
 - Do not report issues for components if you are using custom components: files in <config-dir>/custom_components
 - This is for bugs only. Feature and enhancement requests should go in our community forum: https://community.home-assistant.io/c/feature-requests
 - Provide as many details as possible. Paste logs, configuration sample and code into the backticks. Do not delete any text from this template!
diff --git a/CODEOWNERS b/CODEOWNERS
index 659f434d14b..018fbed67f0 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -184,6 +184,8 @@ homeassistant/components/*/edp_redy.py @abmantis
 homeassistant/components/edp_redy.py @abmantis
 homeassistant/components/eight_sleep.py @mezz64
 homeassistant/components/*/eight_sleep.py @mezz64
+homeassistant/components/esphome/*.py @OttoWinter
+homeassistant/components/*/esphome.py @OttoWinter
 
 # H
 homeassistant/components/hive.py @Rendili @KJonline
@@ -211,6 +213,10 @@ homeassistant/components/melissa.py @kennedyshead
 homeassistant/components/*/melissa.py @kennedyshead
 homeassistant/components/*/mystrom.py @fabaff
 
+# N
+homeassistant/components/ness_alarm.py @nickw444
+homeassistant/components/*/ness_alarm.py @nickw444
+
 # O
 homeassistant/components/openuv/* @bachya
 homeassistant/components/*/openuv.py @bachya
diff --git a/README.rst b/README.rst
index 4f459162a7e..f231d6c5514 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-Home Assistant |Build Status| |Coverage Status| |Chat Status| |Reviewed by Hound|
+Home Assistant |Build Status| |Coverage Status| |Chat Status|
 =================================================================================
 
 Home Assistant is a home automation platform running on Python 3. It is able to track and control all devices at home and offer a platform for automating control.
@@ -33,8 +33,6 @@ of a component, check the `Home Assistant help section <https://home-assistant.i
    :target: https://coveralls.io/r/home-assistant/home-assistant?branch=master
 .. |Chat Status| image:: https://img.shields.io/discord/330944238910963714.svg
    :target: https://discord.gg/c5DvZ4e
-.. |Reviewed by Hound| image:: https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg
-   :target: https://houndci.com
 .. |screenshot-states| image:: https://raw.github.com/home-assistant/home-assistant/master/docs/screenshots.png
    :target: https://home-assistant.io/demo/
 .. |screenshot-components| image:: https://raw.github.com/home-assistant/home-assistant/dev/docs/screenshot-components.png
diff --git a/homeassistant/auth/permissions/const.py b/homeassistant/auth/permissions/const.py
index e60879881c1..d390d010dee 100644
--- a/homeassistant/auth/permissions/const.py
+++ b/homeassistant/auth/permissions/const.py
@@ -1,5 +1,6 @@
 """Permission constants."""
 CAT_ENTITIES = 'entities'
+CAT_CONFIG_ENTRIES = 'config_entries'
 SUBCAT_ALL = 'all'
 
 POLICY_READ = 'read'
diff --git a/homeassistant/components/ads/__init__.py b/homeassistant/components/ads/__init__.py
index 100444c0211..015a12dcfa9 100644
--- a/homeassistant/components/ads/__init__.py
+++ b/homeassistant/components/ads/__init__.py
@@ -125,16 +125,23 @@ class AdsHub:
 
     def shutdown(self, *args, **kwargs):
         """Shutdown ADS connection."""
+        import pyads
         _LOGGER.debug("Shutting down ADS")
         for notification_item in self._notification_items.values():
-            self._client.del_device_notification(
-                notification_item.hnotify,
-                notification_item.huser
-            )
             _LOGGER.debug(
                 "Deleting device notification %d, %d",
                 notification_item.hnotify, notification_item.huser)
-        self._client.close()
+            try:
+                self._client.del_device_notification(
+                    notification_item.hnotify,
+                    notification_item.huser
+                )
+            except pyads.ADSError as err:
+                _LOGGER.error(err)
+        try:
+            self._client.close()
+        except pyads.ADSError as err:
+            _LOGGER.error(err)
 
     def register_device(self, device):
         """Register a new device."""
diff --git a/homeassistant/components/air_quality/__init__.py b/homeassistant/components/air_quality/__init__.py
new file mode 100644
index 00000000000..7aed61ee11c
--- /dev/null
+++ b/homeassistant/components/air_quality/__init__.py
@@ -0,0 +1,147 @@
+"""
+Component for handling Air Quality data for your location.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/air_quality/
+"""
+from datetime import timedelta
+import logging
+
+from homeassistant.helpers.entity_component import EntityComponent
+from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
+from homeassistant.helpers.entity import Entity
+
+_LOGGER = logging.getLogger(__name__)
+
+ATTR_AQI = 'air_quality_index'
+ATTR_ATTRIBUTION = 'attribution'
+ATTR_C02 = 'carbon_dioxide'
+ATTR_CO = 'carbon_monoxide'
+ATTR_N2O = 'nitrogen_oxide'
+ATTR_NO = 'nitrogen_monoxide'
+ATTR_NO2 = 'nitrogen_dioxide'
+ATTR_OZONE = 'ozone'
+ATTR_PM_0_1 = 'particulate_matter_0_1'
+ATTR_PM_10 = 'particulate_matter_10'
+ATTR_PM_2_5 = 'particulate_matter_2_5'
+ATTR_SO2 = 'sulphur_dioxide'
+
+DOMAIN = 'air_quality'
+
+ENTITY_ID_FORMAT = DOMAIN + '.{}'
+
+SCAN_INTERVAL = timedelta(seconds=30)
+
+PROP_TO_ATTR = {
+    'air_quality_index': ATTR_AQI,
+    'attribution': ATTR_ATTRIBUTION,
+    'carbon_dioxide': ATTR_C02,
+    'carbon_monoxide': ATTR_CO,
+    'nitrogen_oxide': ATTR_N2O,
+    'nitrogen_monoxide': ATTR_NO,
+    'nitrogen_dioxide': ATTR_NO2,
+    'ozone': ATTR_OZONE,
+    'particulate_matter_0_1': ATTR_PM_0_1,
+    'particulate_matter_10': ATTR_PM_10,
+    'particulate_matter_2_5': ATTR_PM_2_5,
+    'sulphur_dioxide': ATTR_SO2,
+}
+
+
+async def async_setup(hass, config):
+    """Set up the air quality component."""
+    component = hass.data[DOMAIN] = EntityComponent(
+        _LOGGER, DOMAIN, hass, SCAN_INTERVAL)
+    await component.async_setup(config)
+    return True
+
+
+async def async_setup_entry(hass, entry):
+    """Set up a config entry."""
+    return await hass.data[DOMAIN].async_setup_entry(entry)
+
+
+async def async_unload_entry(hass, entry):
+    """Unload a config entry."""
+    return await hass.data[DOMAIN].async_unload_entry(entry)
+
+
+class AirQualityEntity(Entity):
+    """ABC for air quality data."""
+
+    @property
+    def particulate_matter_2_5(self):
+        """Return the particulate matter 2.5 level."""
+        raise NotImplementedError()
+
+    @property
+    def particulate_matter_10(self):
+        """Return the particulate matter 10 level."""
+        return None
+
+    @property
+    def particulate_matter_0_1(self):
+        """Return the particulate matter 0.1 level."""
+        return None
+
+    @property
+    def air_quality_index(self):
+        """Return the Air Quality Index (AQI)."""
+        return None
+
+    @property
+    def ozone(self):
+        """Return the O3 (ozone) level."""
+        return None
+
+    @property
+    def carbon_monoxide(self):
+        """Return the CO (carbon monoxide) level."""
+        return None
+
+    @property
+    def carbon_dioxide(self):
+        """Return the CO2 (carbon dioxide) level."""
+        return None
+
+    @property
+    def attribution(self):
+        """Return the attribution."""
+        return None
+
+    @property
+    def sulphur_dioxide(self):
+        """Return the SO2 (sulphur dioxide) level."""
+        return None
+
+    @property
+    def nitrogen_oxide(self):
+        """Return the N2O (nitrogen oxide) level."""
+        return None
+
+    @property
+    def nitrogen_monoxide(self):
+        """Return the NO (nitrogen monoxide) level."""
+        return None
+
+    @property
+    def nitrogen_dioxide(self):
+        """Return the NO2 (nitrogen dioxide) level."""
+        return None
+
+    @property
+    def state_attributes(self):
+        """Return the state attributes."""
+        data = {}
+
+        for prop, attr in PROP_TO_ATTR.items():
+            value = getattr(self, prop)
+            if value is not None:
+                data[attr] = value
+
+        return data
+
+    @property
+    def state(self):
+        """Return the current state."""
+        return self.particulate_matter_2_5
diff --git a/homeassistant/components/air_quality/demo.py b/homeassistant/components/air_quality/demo.py
new file mode 100644
index 00000000000..b2b9c10574f
--- /dev/null
+++ b/homeassistant/components/air_quality/demo.py
@@ -0,0 +1,56 @@
+"""
+Demo platform that offers fake air quality data.
+
+For more details about this platform, please refer to the documentation
+https://home-assistant.io/components/demo/
+"""
+from homeassistant.components.air_quality import AirQualityEntity
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the Air Quality."""
+    add_entities([
+        DemoAirQuality('Home', 14, 23, 100),
+        DemoAirQuality('Office', 4, 16, None)
+    ])
+
+
+class DemoAirQuality(AirQualityEntity):
+    """Representation of Air Quality data."""
+
+    def __init__(self, name, pm_2_5, pm_10, n2o):
+        """Initialize the Demo Air Quality."""
+        self._name = name
+        self._pm_2_5 = pm_2_5
+        self._pm_10 = pm_10
+        self._n2o = n2o
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return '{} {}'.format('Demo Air Quality', self._name)
+
+    @property
+    def should_poll(self):
+        """No polling needed for Demo Air Quality."""
+        return False
+
+    @property
+    def particulate_matter_2_5(self):
+        """Return the particulate matter 2.5 level."""
+        return self._pm_2_5
+
+    @property
+    def particulate_matter_10(self):
+        """Return the particulate matter 10 level."""
+        return self._pm_10
+
+    @property
+    def nitrogen_oxide(self):
+        """Return the nitrogen oxide (N2O) level."""
+        return self._n2o
+
+    @property
+    def attribution(self):
+        """Return the attribution."""
+        return 'Powered by Home Assistant'
diff --git a/homeassistant/components/air_quality/opensensemap.py b/homeassistant/components/air_quality/opensensemap.py
new file mode 100644
index 00000000000..fe3cca4876e
--- /dev/null
+++ b/homeassistant/components/air_quality/opensensemap.py
@@ -0,0 +1,105 @@
+"""
+Support for openSenseMap Air Quality data.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/air_quality/opensensemap/
+"""
+from datetime import timedelta
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.air_quality import (
+    PLATFORM_SCHEMA, AirQualityEntity)
+from homeassistant.const import CONF_NAME
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+import homeassistant.helpers.config_validation as cv
+from homeassistant.util import Throttle
+
+REQUIREMENTS = ['opensensemap-api==0.1.3']
+
+_LOGGER = logging.getLogger(__name__)
+
+ATTRIBUTION = 'Data provided by openSenseMap'
+
+CONF_STATION_ID = 'station_id'
+
+SCAN_INTERVAL = timedelta(minutes=10)
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_STATION_ID): cv.string,
+    vol.Optional(CONF_NAME): cv.string,
+})
+
+
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
+    """Set up the openSenseMap air quality platform."""
+    from opensensemap_api import OpenSenseMap
+
+    name = config.get(CONF_NAME)
+    station_id = config[CONF_STATION_ID]
+
+    session = async_get_clientsession(hass)
+    osm_api = OpenSenseMapData(OpenSenseMap(station_id, hass.loop, session))
+
+    await osm_api.async_update()
+
+    if 'name' not in osm_api.api.data:
+        _LOGGER.error("Station %s is not available", station_id)
+        return
+
+    station_name = osm_api.api.data['name'] if name is None else name
+
+    async_add_entities([OpenSenseMapQuality(station_name, osm_api)], True)
+
+
+class OpenSenseMapQuality(AirQualityEntity):
+    """Implementation of an openSenseMap air quality entity."""
+
+    def __init__(self, name, osm):
+        """Initialize the air quality entity."""
+        self._name = name
+        self._osm = osm
+
+    @property
+    def name(self):
+        """Return the name of the air quality entity."""
+        return self._name
+
+    @property
+    def particulate_matter_2_5(self):
+        """Return the particulate matter 2.5 level."""
+        return self._osm.api.pm2_5
+
+    @property
+    def particulate_matter_10(self):
+        """Return the particulate matter 10 level."""
+        return self._osm.api.pm10
+
+    @property
+    def attribution(self):
+        """Return the attribution."""
+        return ATTRIBUTION
+
+    async def async_update(self):
+        """Get the latest data from the openSenseMap API."""
+        await self._osm.async_update()
+
+
+class OpenSenseMapData:
+    """Get the latest data and update the states."""
+
+    def __init__(self, api):
+        """Initialize the data object."""
+        self.api = api
+
+    @Throttle(SCAN_INTERVAL)
+    async def async_update(self):
+        """Get the latest data from the Pi-hole."""
+        from opensensemap_api.exceptions import OpenSenseMapError
+
+        try:
+            await self.api.get_data()
+        except OpenSenseMapError as err:
+            _LOGGER.error("Unable to fetch data: %s", err)
diff --git a/homeassistant/components/alarm_control_panel/__init__.py b/homeassistant/components/alarm_control_panel/__init__.py
index a42e6e880b5..ad8520118b4 100644
--- a/homeassistant/components/alarm_control_panel/__init__.py
+++ b/homeassistant/components/alarm_control_panel/__init__.py
@@ -25,7 +25,7 @@ ATTR_CHANGED_BY = 'changed_by'
 ENTITY_ID_FORMAT = DOMAIN + '.{}'
 
 ALARM_SERVICE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Optional(ATTR_CODE): cv.string,
 })
 
diff --git a/homeassistant/components/alarm_control_panel/ialarm.py b/homeassistant/components/alarm_control_panel/ialarm.py
index efc7436e21b..6115edf406e 100644
--- a/homeassistant/components/alarm_control_panel/ialarm.py
+++ b/homeassistant/components/alarm_control_panel/ialarm.py
@@ -5,14 +5,16 @@ For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/alarm_control_panel.ialarm/
 """
 import logging
+import re
 
 import voluptuous as vol
 
 import homeassistant.components.alarm_control_panel as alarm
 from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA
 from homeassistant.const import (
-    CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME, STATE_ALARM_ARMED_AWAY,
-    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_ALARM_TRIGGERED)
+    CONF_CODE, CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME,
+    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
+    STATE_ALARM_TRIGGERED)
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['pyialarm==0.3']
@@ -36,6 +38,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_HOST): vol.All(cv.string, no_application_protocol),
     vol.Required(CONF_PASSWORD): cv.string,
     vol.Required(CONF_USERNAME): cv.string,
+    vol.Optional(CONF_CODE): cv.positive_int,
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
 })
 
@@ -43,23 +46,25 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up an iAlarm control panel."""
     name = config.get(CONF_NAME)
+    code = config.get(CONF_CODE)
     username = config.get(CONF_USERNAME)
     password = config.get(CONF_PASSWORD)
     host = config.get(CONF_HOST)
 
     url = 'http://{}'.format(host)
-    ialarm = IAlarmPanel(name, username, password, url)
+    ialarm = IAlarmPanel(name, code, username, password, url)
     add_entities([ialarm], True)
 
 
 class IAlarmPanel(alarm.AlarmControlPanel):
     """Representation of an iAlarm status."""
 
-    def __init__(self, name, username, password, url):
+    def __init__(self, name, code, username, password, url):
         """Initialize the iAlarm status."""
         from pyialarm import IAlarm
 
         self._name = name
+        self._code = str(code) if code else None
         self._username = username
         self._password = password
         self._url = url
@@ -71,6 +76,15 @@ class IAlarmPanel(alarm.AlarmControlPanel):
         """Return the name of the device."""
         return self._name
 
+    @property
+    def code_format(self):
+        """Return one or more digits/characters."""
+        if self._code is None:
+            return None
+        if isinstance(self._code, str) and re.search('^\\d+$', self._code):
+            return 'Number'
+        return 'Any'
+
     @property
     def state(self):
         """Return the state of the device."""
@@ -98,12 +112,22 @@ class IAlarmPanel(alarm.AlarmControlPanel):
 
     def alarm_disarm(self, code=None):
         """Send disarm command."""
-        self._client.disarm()
+        if self._validate_code(code):
+            self._client.disarm()
 
     def alarm_arm_away(self, code=None):
         """Send arm away command."""
-        self._client.arm_away()
+        if self._validate_code(code):
+            self._client.arm_away()
 
     def alarm_arm_home(self, code=None):
         """Send arm home command."""
-        self._client.arm_stay()
+        if self._validate_code(code):
+            self._client.arm_stay()
+
+    def _validate_code(self, code):
+        """Validate given code."""
+        check = self._code is None or code == self._code
+        if not check:
+            _LOGGER.warning("Wrong code entered")
+        return check
diff --git a/homeassistant/components/alarm_control_panel/mqtt.py b/homeassistant/components/alarm_control_panel/mqtt.py
index 2a91ac77a86..c943a513c45 100644
--- a/homeassistant/components/alarm_control_panel/mqtt.py
+++ b/homeassistant/components/alarm_control_panel/mqtt.py
@@ -13,13 +13,14 @@ from homeassistant.core import callback
 import homeassistant.components.alarm_control_panel as alarm
 from homeassistant.components import mqtt
 from homeassistant.const import (
-    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED,
-    STATE_ALARM_PENDING, STATE_ALARM_TRIGGERED, STATE_UNKNOWN,
-    CONF_NAME, CONF_CODE)
+    CONF_CODE, CONF_DEVICE, CONF_NAME, STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED, STATE_UNKNOWN)
 from homeassistant.components.mqtt import (
-    ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC,
-    CONF_COMMAND_TOPIC, CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE,
-    CONF_QOS, CONF_RETAIN, MqttAvailability, MqttDiscoveryUpdate, subscription)
+    ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_COMMAND_TOPIC,
+    CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, CONF_RETAIN,
+    CONF_STATE_TOPIC, MqttAvailability, MqttDiscoveryUpdate,
+    MqttEntityDeviceInfo, subscription)
 from homeassistant.components.mqtt.discovery import MQTT_DISCOVERY_NEW
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -30,6 +31,7 @@ _LOGGER = logging.getLogger(__name__)
 CONF_PAYLOAD_DISARM = 'payload_disarm'
 CONF_PAYLOAD_ARM_HOME = 'payload_arm_home'
 CONF_PAYLOAD_ARM_AWAY = 'payload_arm_away'
+CONF_UNIQUE_ID = 'unique_id'
 
 DEFAULT_ARM_AWAY = 'ARM_AWAY'
 DEFAULT_ARM_HOME = 'ARM_HOME'
@@ -45,6 +47,8 @@ PLATFORM_SCHEMA = mqtt.MQTT_BASE_PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_PAYLOAD_ARM_AWAY, default=DEFAULT_ARM_AWAY): cv.string,
     vol.Optional(CONF_PAYLOAD_ARM_HOME, default=DEFAULT_ARM_HOME): cv.string,
     vol.Optional(CONF_PAYLOAD_DISARM, default=DEFAULT_DISARM): cv.string,
+    vol.Optional(CONF_UNIQUE_ID): cv.string,
+    vol.Optional(CONF_DEVICE): mqtt.MQTT_ENTITY_DEVICE_INFO_SCHEMA,
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
@@ -73,7 +77,7 @@ async def _async_setup_entity(config, async_add_entities,
     async_add_entities([MqttAlarm(config, discovery_hash)])
 
 
-class MqttAlarm(MqttAvailability, MqttDiscoveryUpdate,
+class MqttAlarm(MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo,
                 alarm.AlarmControlPanel):
     """Representation of a MQTT alarm status."""
 
@@ -81,17 +85,20 @@ class MqttAlarm(MqttAvailability, MqttDiscoveryUpdate,
         """Init the MQTT Alarm Control Panel."""
         self._state = STATE_UNKNOWN
         self._config = config
+        self._unique_id = config.get(CONF_UNIQUE_ID)
         self._sub_state = None
 
         availability_topic = config.get(CONF_AVAILABILITY_TOPIC)
         payload_available = config.get(CONF_PAYLOAD_AVAILABLE)
         payload_not_available = config.get(CONF_PAYLOAD_NOT_AVAILABLE)
         qos = config.get(CONF_QOS)
+        device_config = config.get(CONF_DEVICE)
 
         MqttAvailability.__init__(self, availability_topic, qos,
                                   payload_available, payload_not_available)
         MqttDiscoveryUpdate.__init__(self, discovery_hash,
                                      self.discovery_update)
+        MqttEntityDeviceInfo.__init__(self, device_config)
 
     async def async_added_to_hass(self):
         """Subscribe mqtt events."""
@@ -127,7 +134,8 @@ class MqttAlarm(MqttAvailability, MqttDiscoveryUpdate,
 
     async def async_will_remove_from_hass(self):
         """Unsubscribe when removed."""
-        await subscription.async_unsubscribe_topics(self.hass, self._sub_state)
+        self._sub_state = await subscription.async_unsubscribe_topics(
+            self.hass, self._sub_state)
         await MqttAvailability.async_will_remove_from_hass(self)
 
     @property
@@ -140,6 +148,11 @@ class MqttAlarm(MqttAvailability, MqttDiscoveryUpdate,
         """Return the name of the device."""
         return self._config.get(CONF_NAME)
 
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._unique_id
+
     @property
     def state(self):
         """Return the state of the device."""
diff --git a/homeassistant/components/alarm_control_panel/ness_alarm.py b/homeassistant/components/alarm_control_panel/ness_alarm.py
new file mode 100644
index 00000000000..ec52ef51e2f
--- /dev/null
+++ b/homeassistant/components/alarm_control_panel/ness_alarm.py
@@ -0,0 +1,107 @@
+"""
+Support for Ness D8X/D16X alarm panel.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/alarm_control_panel.ness_alarm/
+"""
+
+import logging
+
+import homeassistant.components.alarm_control_panel as alarm
+from homeassistant.components.ness_alarm import (
+    DATA_NESS, SIGNAL_ARMING_STATE_CHANGED)
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMING,
+    STATE_ALARM_TRIGGERED, STATE_ALARM_PENDING, STATE_ALARM_DISARMED)
+from homeassistant.core import callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['ness_alarm']
+
+
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Set up the Ness Alarm alarm control panel devices."""
+    if discovery_info is None:
+        return
+
+    device = NessAlarmPanel(hass.data[DATA_NESS], 'Alarm Panel')
+    async_add_entities([device])
+
+
+class NessAlarmPanel(alarm.AlarmControlPanel):
+    """Representation of a Ness alarm panel."""
+
+    def __init__(self, client, name):
+        """Initialize the alarm panel."""
+        self._client = client
+        self._name = name
+        self._state = None
+
+    async def async_added_to_hass(self):
+        """Register callbacks."""
+        async_dispatcher_connect(
+            self.hass, SIGNAL_ARMING_STATE_CHANGED,
+            self._handle_arming_state_change)
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def should_poll(self):
+        """Return the polling state."""
+        return False
+
+    @property
+    def code_format(self):
+        """Return the regex for code format or None if no code is required."""
+        return 'Number'
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        return self._state
+
+    async def async_alarm_disarm(self, code=None):
+        """Send disarm command."""
+        await self._client.disarm(code)
+
+    async def async_alarm_arm_away(self, code=None):
+        """Send arm away command."""
+        await self._client.arm_away(code)
+
+    async def async_alarm_arm_home(self, code=None):
+        """Send arm home command."""
+        await self._client.arm_home(code)
+
+    async def async_alarm_trigger(self, code=None):
+        """Send trigger/panic command."""
+        await self._client.panic(code)
+
+    @callback
+    def _handle_arming_state_change(self, arming_state):
+        """Handle arming state update."""
+        from nessclient import ArmingState
+
+        if arming_state == ArmingState.UNKNOWN:
+            self._state = None
+        elif arming_state == ArmingState.DISARMED:
+            self._state = STATE_ALARM_DISARMED
+        elif arming_state == ArmingState.ARMING:
+            self._state = STATE_ALARM_ARMING
+        elif arming_state == ArmingState.EXIT_DELAY:
+            self._state = STATE_ALARM_ARMING
+        elif arming_state == ArmingState.ARMED:
+            self._state = STATE_ALARM_ARMED_AWAY
+        elif arming_state == ArmingState.ENTRY_DELAY:
+            self._state = STATE_ALARM_PENDING
+        elif arming_state == ArmingState.TRIGGERED:
+            self._state = STATE_ALARM_TRIGGERED
+        else:
+            _LOGGER.warning("Unhandled arming state: %s", arming_state)
+
+        self.async_schedule_update_ha_state()
diff --git a/homeassistant/components/alarm_control_panel/nx584.py b/homeassistant/components/alarm_control_panel/nx584.py
index 67ec73bceba..1b3e86c4ca6 100644
--- a/homeassistant/components/alarm_control_panel/nx584.py
+++ b/homeassistant/components/alarm_control_panel/nx584.py
@@ -13,7 +13,7 @@ import homeassistant.components.alarm_control_panel as alarm
 from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA
 from homeassistant.const import (
     CONF_HOST, CONF_NAME, CONF_PORT, STATE_ALARM_ARMED_AWAY,
-    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_UNKNOWN)
+    STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED, STATE_ALARM_TRIGGERED)
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['pynx584==0.4']
@@ -43,7 +43,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         add_entities([NX584Alarm(hass, url, name)])
     except requests.exceptions.ConnectionError as ex:
         _LOGGER.error("Unable to connect to NX584: %s", str(ex))
-        return False
+        return
 
 
 class NX584Alarm(alarm.AlarmControlPanel):
@@ -60,7 +60,7 @@ class NX584Alarm(alarm.AlarmControlPanel):
         # talk to the API and trigger a requests exception for setup_platform()
         # to catch
         self._alarm.list_zones()
-        self._state = STATE_UNKNOWN
+        self._state = None
 
     @property
     def name(self):
@@ -85,11 +85,11 @@ class NX584Alarm(alarm.AlarmControlPanel):
         except requests.exceptions.ConnectionError as ex:
             _LOGGER.error("Unable to connect to %(host)s: %(reason)s",
                           dict(host=self._url, reason=ex))
-            self._state = STATE_UNKNOWN
+            self._state = None
             zones = []
         except IndexError:
             _LOGGER.error("NX584 reports no partitions")
-            self._state = STATE_UNKNOWN
+            self._state = None
             zones = []
 
         bypassed = False
@@ -107,6 +107,10 @@ class NX584Alarm(alarm.AlarmControlPanel):
         else:
             self._state = STATE_ALARM_ARMED_AWAY
 
+        for flag in part['condition_flags']:
+            if flag == "Siren on":
+                self._state = STATE_ALARM_TRIGGERED
+
     def alarm_disarm(self, code=None):
         """Send disarm command."""
         self._alarm.disarm(code)
diff --git a/homeassistant/components/alarm_control_panel/yale_smart_alarm.py b/homeassistant/components/alarm_control_panel/yale_smart_alarm.py
index 357a8c350bc..67b74033442 100755
--- a/homeassistant/components/alarm_control_panel/yale_smart_alarm.py
+++ b/homeassistant/components/alarm_control_panel/yale_smart_alarm.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
     STATE_ALARM_ARMED_AWAY, STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED)
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['yalesmartalarmclient==0.1.5']
+REQUIREMENTS = ['yalesmartalarmclient==0.1.6']
 
 CONF_AREA_ID = 'area_id'
 
diff --git a/homeassistant/components/alarmdecoder.py b/homeassistant/components/alarmdecoder.py
index 1377b2a6c3a..92eab728210 100644
--- a/homeassistant/components/alarmdecoder.py
+++ b/homeassistant/components/alarmdecoder.py
@@ -32,6 +32,7 @@ CONF_DEVICE_TYPE = 'type'
 CONF_PANEL_DISPLAY = 'panel_display'
 CONF_ZONE_NAME = 'name'
 CONF_ZONE_TYPE = 'type'
+CONF_ZONE_LOOP = 'loop'
 CONF_ZONE_RFID = 'rfid'
 CONF_ZONES = 'zones'
 CONF_RELAY_ADDR = 'relayaddr'
@@ -75,6 +76,8 @@ ZONE_SCHEMA = vol.Schema({
     vol.Optional(CONF_ZONE_TYPE,
                  default=DEFAULT_ZONE_TYPE): vol.Any(DEVICE_CLASSES_SCHEMA),
     vol.Optional(CONF_ZONE_RFID): cv.string,
+    vol.Optional(CONF_ZONE_LOOP):
+        vol.All(vol.Coerce(int), vol.Range(min=1, max=4)),
     vol.Inclusive(CONF_RELAY_ADDR, 'relaylocation',
                   'Relay address and channel must exist together'): cv.byte,
     vol.Inclusive(CONF_RELAY_CHAN, 'relaylocation',
diff --git a/homeassistant/components/alexa/__init__.py b/homeassistant/components/alexa/__init__.py
index 337d8993b28..0bfa01a83ca 100644
--- a/homeassistant/components/alexa/__init__.py
+++ b/homeassistant/components/alexa/__init__.py
@@ -13,8 +13,9 @@ from homeassistant.helpers import entityfilter
 
 from . import flash_briefings, intent, smart_home
 from .const import (
-    CONF_AUDIO, CONF_DISPLAY_URL, CONF_TEXT, CONF_TITLE, CONF_UID, DOMAIN,
-    CONF_FILTER, CONF_ENTITY_CONFIG)
+    CONF_AUDIO, CONF_CLIENT_ID, CONF_CLIENT_SECRET, CONF_DISPLAY_URL,
+    CONF_ENDPOINT, CONF_TEXT, CONF_TITLE, CONF_UID, DOMAIN, CONF_FILTER,
+    CONF_ENTITY_CONFIG)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -30,6 +31,9 @@ ALEXA_ENTITY_SCHEMA = vol.Schema({
 })
 
 SMART_HOME_SCHEMA = vol.Schema({
+    vol.Optional(CONF_ENDPOINT): cv.string,
+    vol.Optional(CONF_CLIENT_ID): cv.string,
+    vol.Optional(CONF_CLIENT_SECRET): cv.string,
     vol.Optional(CONF_FILTER, default={}): entityfilter.FILTER_SCHEMA,
     vol.Optional(CONF_ENTITY_CONFIG): {cv.entity_id: ALEXA_ENTITY_SCHEMA}
 })
diff --git a/homeassistant/components/alexa/auth.py b/homeassistant/components/alexa/auth.py
new file mode 100644
index 00000000000..978cb611895
--- /dev/null
+++ b/homeassistant/components/alexa/auth.py
@@ -0,0 +1,154 @@
+"""Support for Alexa skill auth."""
+
+import asyncio
+import json
+import logging
+from datetime import timedelta
+import aiohttp
+import async_timeout
+
+from homeassistant.core import callback
+from homeassistant.helpers import aiohttp_client
+from homeassistant.util import dt
+from .const import DEFAULT_TIMEOUT
+
+_LOGGER = logging.getLogger(__name__)
+
+LWA_TOKEN_URI = "https://api.amazon.com/auth/o2/token"
+LWA_HEADERS = {
+    "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+}
+
+PREEMPTIVE_REFRESH_TTL_IN_SECONDS = 300
+STORAGE_KEY = 'alexa_auth'
+STORAGE_VERSION = 1
+STORAGE_EXPIRE_TIME = "expire_time"
+STORAGE_ACCESS_TOKEN = "access_token"
+STORAGE_REFRESH_TOKEN = "refresh_token"
+
+
+class Auth:
+    """Handle authentication to send events to Alexa."""
+
+    def __init__(self, hass, client_id, client_secret):
+        """Initialize the Auth class."""
+        self.hass = hass
+
+        self.client_id = client_id
+        self.client_secret = client_secret
+
+        self._prefs = None
+        self._store = hass.helpers.storage.Store(STORAGE_VERSION, STORAGE_KEY)
+
+        self._get_token_lock = asyncio.Lock(loop=hass.loop)
+
+    async def async_do_auth(self, accept_grant_code):
+        """Do authentication with an AcceptGrant code."""
+        # access token not retrieved yet for the first time, so this should
+        # be an access token request
+
+        lwa_params = {
+            "grant_type": "authorization_code",
+            "code": accept_grant_code,
+            "client_id": self.client_id,
+            "client_secret": self.client_secret
+        }
+        _LOGGER.debug("Calling LWA to get the access token (first time), "
+                      "with: %s", json.dumps(lwa_params))
+
+        return await self._async_request_new_token(lwa_params)
+
+    async def async_get_access_token(self):
+        """Perform access token or token refresh request."""
+        async with self._get_token_lock:
+            if self._prefs is None:
+                await self.async_load_preferences()
+
+            if self.is_token_valid():
+                _LOGGER.debug("Token still valid, using it.")
+                return self._prefs[STORAGE_ACCESS_TOKEN]
+
+            if self._prefs[STORAGE_REFRESH_TOKEN] is None:
+                _LOGGER.debug("Token invalid and no refresh token available.")
+                return None
+
+            lwa_params = {
+                "grant_type": "refresh_token",
+                "refresh_token": self._prefs[STORAGE_REFRESH_TOKEN],
+                "client_id": self.client_id,
+                "client_secret": self.client_secret
+            }
+
+            _LOGGER.debug("Calling LWA to refresh the access token.")
+            return await self._async_request_new_token(lwa_params)
+
+    @callback
+    def is_token_valid(self):
+        """Check if a token is already loaded and if it is still valid."""
+        if not self._prefs[STORAGE_ACCESS_TOKEN]:
+            return False
+
+        expire_time = dt.parse_datetime(self._prefs[STORAGE_EXPIRE_TIME])
+        preemptive_expire_time = expire_time - timedelta(
+            seconds=PREEMPTIVE_REFRESH_TTL_IN_SECONDS)
+
+        return dt.utcnow() < preemptive_expire_time
+
+    async def _async_request_new_token(self, lwa_params):
+
+        try:
+            session = aiohttp_client.async_get_clientsession(self.hass)
+            with async_timeout.timeout(DEFAULT_TIMEOUT, loop=self.hass.loop):
+                response = await session.post(LWA_TOKEN_URI,
+                                              headers=LWA_HEADERS,
+                                              data=lwa_params,
+                                              allow_redirects=True)
+
+        except (asyncio.TimeoutError, aiohttp.ClientError):
+            _LOGGER.error("Timeout calling LWA to get auth token.")
+            return None
+
+        _LOGGER.debug("LWA response header: %s", response.headers)
+        _LOGGER.debug("LWA response status: %s", response.status)
+
+        if response.status != 200:
+            _LOGGER.error("Error calling LWA to get auth token.")
+            return None
+
+        response_json = await response.json()
+        _LOGGER.debug("LWA response body  : %s", response_json)
+
+        access_token = response_json["access_token"]
+        refresh_token = response_json["refresh_token"]
+        expires_in = response_json["expires_in"]
+        expire_time = dt.utcnow() + timedelta(seconds=expires_in)
+
+        await self._async_update_preferences(access_token, refresh_token,
+                                             expire_time.isoformat())
+
+        return access_token
+
+    async def async_load_preferences(self):
+        """Load preferences with stored tokens."""
+        self._prefs = await self._store.async_load()
+
+        if self._prefs is None:
+            self._prefs = {
+                STORAGE_ACCESS_TOKEN: None,
+                STORAGE_REFRESH_TOKEN: None,
+                STORAGE_EXPIRE_TIME: None
+            }
+
+    async def _async_update_preferences(self, access_token, refresh_token,
+                                        expire_time):
+        """Update user preferences."""
+        if self._prefs is None:
+            await self.async_load_preferences()
+
+        if access_token is not None:
+            self._prefs[STORAGE_ACCESS_TOKEN] = access_token
+        if refresh_token is not None:
+            self._prefs[STORAGE_REFRESH_TOKEN] = refresh_token
+        if expire_time is not None:
+            self._prefs[STORAGE_EXPIRE_TIME] = expire_time
+        await self._store.async_save(self._prefs)
diff --git a/homeassistant/components/alexa/const.py b/homeassistant/components/alexa/const.py
index 7d6489b535a..78f7d02f5f0 100644
--- a/homeassistant/components/alexa/const.py
+++ b/homeassistant/components/alexa/const.py
@@ -10,6 +10,9 @@ CONF_DISPLAY_URL = 'display_url'
 
 CONF_FILTER = 'filter'
 CONF_ENTITY_CONFIG = 'entity_config'
+CONF_ENDPOINT = 'endpoint'
+CONF_CLIENT_ID = 'client_id'
+CONF_CLIENT_SECRET = 'client_secret'
 
 ATTR_UID = 'uid'
 ATTR_UPDATE_DATE = 'updateDate'
@@ -21,3 +24,5 @@ ATTR_REDIRECTION_URL = 'redirectionURL'
 SYN_RESOLUTION_MATCH = 'ER_SUCCESS_MATCH'
 
 DATE_FORMAT = '%Y-%m-%dT%H:%M:%S.0Z'
+
+DEFAULT_TIMEOUT = 30
diff --git a/homeassistant/components/alexa/smart_home.py b/homeassistant/components/alexa/smart_home.py
index f06b853087f..1558a1bf218 100644
--- a/homeassistant/components/alexa/smart_home.py
+++ b/homeassistant/components/alexa/smart_home.py
@@ -5,15 +5,22 @@ https://developer.amazon.com/docs/smarthome/understand-the-smart-home-skill-api.
 https://developer.amazon.com/docs/device-apis/message-guide.html
 """
 
+import asyncio
 from collections import OrderedDict
 from datetime import datetime
+import json
 import logging
 import math
 from uuid import uuid4
 
+import aiohttp
+import async_timeout
+
 from homeassistant.components import (
     alert, automation, binary_sensor, climate, cover, fan, group, http,
     input_boolean, light, lock, media_player, scene, script, sensor, switch)
+from homeassistant.helpers import aiohttp_client
+from homeassistant.helpers.event import async_track_state_change
 from homeassistant.const import (
     ATTR_DEVICE_CLASS, ATTR_ENTITY_ID, ATTR_SUPPORTED_FEATURES,
     ATTR_TEMPERATURE, ATTR_UNIT_OF_MEASUREMENT, CLOUD_NEVER_EXPOSED_ENTITIES,
@@ -21,13 +28,15 @@ from homeassistant.const import (
     SERVICE_MEDIA_PLAY, SERVICE_MEDIA_PREVIOUS_TRACK, SERVICE_MEDIA_STOP,
     SERVICE_SET_COVER_POSITION, SERVICE_TURN_OFF, SERVICE_TURN_ON,
     SERVICE_UNLOCK, SERVICE_VOLUME_SET, STATE_LOCKED, STATE_ON, STATE_UNLOCKED,
-    TEMP_CELSIUS, TEMP_FAHRENHEIT)
+    TEMP_CELSIUS, TEMP_FAHRENHEIT, MATCH_ALL)
 import homeassistant.core as ha
 import homeassistant.util.color as color_util
 from homeassistant.util.decorator import Registry
 from homeassistant.util.temperature import convert as convert_temperature
 
-from .const import CONF_ENTITY_CONFIG, CONF_FILTER
+from .const import CONF_CLIENT_ID, CONF_CLIENT_SECRET, CONF_ENDPOINT, \
+    CONF_ENTITY_CONFIG, CONF_FILTER, DATE_FORMAT, DEFAULT_TIMEOUT
+from .auth import Auth
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -37,6 +46,8 @@ API_EVENT = 'event'
 API_CONTEXT = 'context'
 API_HEADER = 'header'
 API_PAYLOAD = 'payload'
+API_SCOPE = 'scope'
+API_CHANGE = 'change'
 
 API_TEMP_UNITS = {
     TEMP_FAHRENHEIT: 'FAHRENHEIT',
@@ -66,6 +77,8 @@ HANDLERS = Registry()
 ENTITY_ADAPTERS = Registry()
 EVENT_ALEXA_SMART_HOME = 'alexa_smart_home'
 
+AUTH_KEY = "alexa.smart_home.auth"
+
 
 class _DisplayCategory:
     """Possible display categories for Discovery response.
@@ -375,6 +388,8 @@ class _AlexaInterface:
                     'name': prop_name,
                     'namespace': self.name(),
                     'value': prop_value,
+                    'timeOfSample': datetime.now().strftime(DATE_FORMAT),
+                    'uncertaintyInMilliseconds': 0
                 }
 
 
@@ -390,6 +405,9 @@ class _AlexaPowerController(_AlexaInterface):
     def properties_supported(self):
         return [{'name': 'powerState'}]
 
+    def properties_proactively_reported(self):
+        return True
+
     def properties_retrievable(self):
         return True
 
@@ -417,6 +435,9 @@ class _AlexaLockController(_AlexaInterface):
     def properties_retrievable(self):
         return True
 
+    def properties_proactively_reported(self):
+        return True
+
     def get_property(self, name):
         if name != 'lockState':
             raise _UnsupportedProperty(name)
@@ -454,6 +475,9 @@ class _AlexaBrightnessController(_AlexaInterface):
     def properties_supported(self):
         return [{'name': 'brightness'}]
 
+    def properties_proactively_reported(self):
+        return True
+
     def properties_retrievable(self):
         return True
 
@@ -585,6 +609,9 @@ class _AlexaTemperatureSensor(_AlexaInterface):
     def properties_supported(self):
         return [{'name': 'temperature'}]
 
+    def properties_proactively_reported(self):
+        return True
+
     def properties_retrievable(self):
         return True
 
@@ -625,6 +652,9 @@ class _AlexaContactSensor(_AlexaInterface):
     def properties_supported(self):
         return [{'name': 'detectionState'}]
 
+    def properties_proactively_reported(self):
+        return True
+
     def properties_retrievable(self):
         return True
 
@@ -648,6 +678,9 @@ class _AlexaMotionSensor(_AlexaInterface):
     def properties_supported(self):
         return [{'name': 'detectionState'}]
 
+    def properties_proactively_reported(self):
+        return True
+
     def properties_retrievable(self):
         return True
 
@@ -686,6 +719,9 @@ class _AlexaThermostatController(_AlexaInterface):
             properties.append({'name': 'thermostatMode'})
         return properties
 
+    def properties_proactively_reported(self):
+        return True
+
     def properties_retrievable(self):
         return True
 
@@ -948,8 +984,11 @@ class _Cause:
 class Config:
     """Hold the configuration for Alexa."""
 
-    def __init__(self, should_expose, entity_config=None):
+    def __init__(self, endpoint, async_get_access_token, should_expose,
+                 entity_config=None):
         """Initialize the configuration."""
+        self.endpoint = endpoint
+        self.async_get_access_token = async_get_access_token
         self.should_expose = should_expose
         self.entity_config = entity_config or {}
 
@@ -964,12 +1003,62 @@ def async_setup(hass, config):
     Even if that's disabled, the functionality in this module may still be used
     by the cloud component which will call async_handle_message directly.
     """
+    if config.get(CONF_CLIENT_ID) and config.get(CONF_CLIENT_SECRET):
+        hass.data[AUTH_KEY] = Auth(hass, config[CONF_CLIENT_ID],
+                                   config[CONF_CLIENT_SECRET])
+
+    async_get_access_token = \
+        hass.data[AUTH_KEY].async_get_access_token if AUTH_KEY in hass.data \
+        else None
+
     smart_home_config = Config(
+        endpoint=config.get(CONF_ENDPOINT),
+        async_get_access_token=async_get_access_token,
         should_expose=config[CONF_FILTER],
         entity_config=config.get(CONF_ENTITY_CONFIG),
     )
     hass.http.register_view(SmartHomeView(smart_home_config))
 
+    if AUTH_KEY in hass.data:
+        hass.loop.create_task(
+            async_enable_proactive_mode(hass, smart_home_config))
+
+
+async def async_enable_proactive_mode(hass, smart_home_config):
+    """Enable the proactive mode.
+
+    Proactive mode makes this component report state changes to Alexa.
+    """
+    if smart_home_config.async_get_access_token is None:
+        # no function to call to get token
+        return
+
+    if await smart_home_config.async_get_access_token() is None:
+        # not ready yet
+        return
+
+    async def async_entity_state_listener(changed_entity, old_state,
+                                          new_state):
+        if not smart_home_config.should_expose(changed_entity):
+            _LOGGER.debug("Not exposing %s because filtered by config",
+                          changed_entity)
+            return
+
+        if new_state.domain not in ENTITY_ADAPTERS:
+            return
+
+        alexa_changed_entity = \
+            ENTITY_ADAPTERS[new_state.domain](hass, smart_home_config,
+                                              new_state)
+
+        for interface in alexa_changed_entity.interfaces():
+            if interface.properties_proactively_reported():
+                await async_send_changereport_message(hass, smart_home_config,
+                                                      alexa_changed_entity)
+                return
+
+    async_track_state_change(hass, MATCH_ALL, async_entity_state_listener)
+
 
 class SmartHomeView(http.HomeAssistantView):
     """Expose Smart Home v3 payload interface via HTTP POST."""
@@ -1112,6 +1201,24 @@ class _AlexaResponse:
         """
         self._response[API_EVENT][API_HEADER]['correlationToken'] = token
 
+    def set_endpoint_full(self, bearer_token, endpoint_id, cookie=None):
+        """Set the endpoint dictionary.
+
+        This is used to send proactive messages to Alexa.
+        """
+        self._response[API_EVENT][API_ENDPOINT] = {
+            API_SCOPE: {
+                'type': 'BearerToken',
+                'token': bearer_token
+            }
+        }
+
+        if endpoint_id is not None:
+            self._response[API_EVENT][API_ENDPOINT]['endpointId'] = endpoint_id
+
+        if cookie is not None:
+            self._response[API_EVENT][API_ENDPOINT]['cookie'] = cookie
+
     def set_endpoint(self, endpoint):
         """Set the endpoint.
 
@@ -1222,6 +1329,62 @@ async def async_handle_message(
     return response.serialize()
 
 
+async def async_send_changereport_message(hass, config, alexa_entity):
+    """Send a ChangeReport message for an Alexa entity."""
+    token = await config.async_get_access_token()
+    if not token:
+        _LOGGER.error("Invalid access token.")
+        return
+
+    headers = {
+        "Authorization": "Bearer {}".format(token),
+        "Content-Type": "application/json;charset=UTF-8"
+    }
+
+    endpoint = alexa_entity.entity_id()
+
+    # this sends all the properties of the Alexa Entity, whether they have
+    # changed or not. this should be improved, and properties that have not
+    # changed should be moved to the 'context' object
+    properties = list(alexa_entity.serialize_properties())
+
+    payload = {
+        API_CHANGE: {
+            'cause': {'type': _Cause.APP_INTERACTION},
+            'properties': properties
+        }
+    }
+
+    message = _AlexaResponse(name='ChangeReport', namespace='Alexa',
+                             payload=payload)
+    message.set_endpoint_full(token, endpoint)
+
+    message_str = json.dumps(message.serialize())
+
+    try:
+        session = aiohttp_client.async_get_clientsession(hass)
+        with async_timeout.timeout(DEFAULT_TIMEOUT, loop=hass.loop):
+            response = await session.post(config.endpoint,
+                                          headers=headers,
+                                          data=message_str,
+                                          allow_redirects=True)
+
+    except (asyncio.TimeoutError, aiohttp.ClientError):
+        _LOGGER.error("Timeout calling LWA to get auth token.")
+        return None
+
+    response_text = await response.text()
+
+    _LOGGER.debug("Sent: %s", message_str)
+    _LOGGER.debug("Received (%s): %s", response.status, response_text)
+
+    if response.status != 202:
+        response_json = json.loads(response_text)
+        _LOGGER.error("Error when sending ChangeReport to Alexa: %s: %s",
+                      response_json["payload"]["code"],
+                      response_json["payload"]["description"])
+
+
 @HANDLERS.register(('Alexa.Discovery', 'Discover'))
 async def async_api_discovery(hass, config, directive, context):
     """Create a API formatted discovery response.
@@ -1258,8 +1421,9 @@ async def async_api_discovery(hass, config, directive, context):
             i.serialize_discovery() for i in alexa_entity.interfaces()]
 
         if not endpoint['capabilities']:
-            _LOGGER.debug("Not exposing %s because it has no capabilities",
-                          entity.entity_id)
+            _LOGGER.debug(
+                "Not exposing %s because it has no capabilities",
+                entity.entity_id)
             continue
         discovery_endpoints.append(endpoint)
 
@@ -1270,6 +1434,25 @@ async def async_api_discovery(hass, config, directive, context):
     )
 
 
+@HANDLERS.register(('Alexa.Authorization', 'AcceptGrant'))
+async def async_api_accept_grant(hass, config, directive, context):
+    """Create a API formatted AcceptGrant response.
+
+    Async friendly.
+    """
+    auth_code = directive.payload['grant']['code']
+    _LOGGER.debug("AcceptGrant code: %s", auth_code)
+
+    if AUTH_KEY in hass.data:
+        await hass.data[AUTH_KEY].async_do_auth(auth_code)
+        await async_enable_proactive_mode(hass, config)
+
+    return directive.response(
+        name='AcceptGrant.Response',
+        namespace='Alexa.Authorization',
+        payload={})
+
+
 @HANDLERS.register(('Alexa.PowerController', 'TurnOn'))
 async def async_api_turn_on(hass, config, directive, context):
     """Process a turn on request."""
diff --git a/homeassistant/components/arlo.py b/homeassistant/components/arlo.py
index f7d9f012f65..aebd57098b5 100644
--- a/homeassistant/components/arlo.py
+++ b/homeassistant/components/arlo.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
 from homeassistant.helpers.event import track_time_interval
 from homeassistant.helpers.dispatcher import dispatcher_send
 
-REQUIREMENTS = ['pyarlo==0.2.2']
+REQUIREMENTS = ['pyarlo==0.2.3']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/asuswrt.py b/homeassistant/components/asuswrt.py
index 959d39038e2..25e7a59f47c 100644
--- a/homeassistant/components/asuswrt.py
+++ b/homeassistant/components/asuswrt.py
@@ -14,7 +14,7 @@ from homeassistant.const import (
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 
-REQUIREMENTS = ['aioasuswrt==1.1.15']
+REQUIREMENTS = ['aioasuswrt==1.1.17']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/auth/.translations/ca.json b/homeassistant/components/auth/.translations/ca.json
index 236352a9018..e5ece421a0b 100644
--- a/homeassistant/components/auth/.translations/ca.json
+++ b/homeassistant/components/auth/.translations/ca.json
@@ -5,28 +5,28 @@
                 "no_available_service": "No hi ha serveis de notificaci\u00f3 disponibles."
             },
             "error": {
-                "invalid_code": "Codi inv\u00e0lid, si us plau torni a provar-ho."
+                "invalid_code": "Codi inv\u00e0lid, si us plau torna a provar-ho."
             },
             "step": {
                 "init": {
-                    "description": "Seleccioneu un dels serveis de notificaci\u00f3:",
-                    "title": "Configureu una contrasenya d'un sol \u00fas a trav\u00e9s del component de notificacions"
+                    "description": "Selecciona un dels serveis de notificaci\u00f3:",
+                    "title": "Configuraci\u00f3 d'una contrasenya d'un sol \u00fas a trav\u00e9s del component de notificacions"
                 },
                 "setup": {
-                    "description": "S'ha enviat una contrasenya d'un sol \u00fas mitjan\u00e7ant **notify.{notify_service}**. Introdu\u00efu-la a continuaci\u00f3:",
-                    "title": "Verifiqueu la configuraci\u00f3"
+                    "description": "S'ha enviat una contrasenya d'un sol \u00fas mitjan\u00e7ant **notify.{notify_service}**. Introdueix-la a continuaci\u00f3:",
+                    "title": "Verificaci\u00f3 de la configuraci\u00f3"
                 }
             },
             "title": "Contrasenya d'un sol \u00fas del servei de notificacions"
         },
         "totp": {
             "error": {
-                "invalid_code": "Codi inv\u00e0lid, si us plau torni a provar-ho. Si obteniu aquest error repetidament, assegureu-vos que la data i hora de Home Assistant sigui correcta i precisa."
+                "invalid_code": "Codi inv\u00e0lid, si us plau torna a provar-ho. Si obtens aquest error repetidament, assegura't que la data i hora de Home Assistant siguin correctes i acurades."
             },
             "step": {
                 "init": {
-                    "description": "Per activar la verificaci\u00f3 en dos passos mitjan\u00e7ant contrasenyes d'un sol \u00fas basades en temps, escanegeu el codi QR amb la vostre aplicaci\u00f3 de verificaci\u00f3. Si no en teniu cap, us recomanem [Google Authenticator](https://support.google.com/accounts/answer/1066447) o b\u00e9 [Authy](https://authy.com/). \n\n {qr_code} \n \nDespr\u00e9s d'escanejar el codi QR, introdu\u00efu el codi de sis d\u00edgits proporcionat per l'aplicaci\u00f3. Si teniu problemes per escanejar el codi QR, feu una configuraci\u00f3 manual amb el codi **`{code}`**.",
-                    "title": "Configureu la verificaci\u00f3 en dos passos utilitzant TOTP"
+                    "description": "Per activar la verificaci\u00f3 en dos passos mitjan\u00e7ant contrasenyes d'un sol \u00fas basades en temps, escaneja el codi QR amb la teva aplicaci\u00f3 de verificaci\u00f3. Si no en tens cap, et recomanem [Google Authenticator](https://support.google.com/accounts/answer/1066447) o b\u00e9 [Authy](https://authy.com/). \n\n {qr_code} \n \nDespr\u00e9s d'escanejar el codi QR, introdueix el codi de sis d\u00edgits proporcionat per l'aplicaci\u00f3. Si tens problemes per escanejar el codi QR, fes una configuraci\u00f3 manual amb el codi **`{code}`**.",
+                    "title": "Configura la verificaci\u00f3 en dos passos utilitzant TOTP"
                 }
             },
             "title": "TOTP"
diff --git a/homeassistant/components/automation/__init__.py b/homeassistant/components/automation/__init__.py
index 4a2df399e0a..6c9b04f9fa2 100644
--- a/homeassistant/components/automation/__init__.py
+++ b/homeassistant/components/automation/__init__.py
@@ -94,11 +94,11 @@ PLATFORM_SCHEMA = vol.Schema({
 })
 
 SERVICE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
 })
 
 TRIGGER_SERVICE_SCHEMA = vol.Schema({
-    vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Optional(ATTR_VARIABLES, default={}): dict,
 })
 
@@ -375,7 +375,15 @@ def _async_get_action(hass, config, name):
     async def action(entity_id, variables, context):
         """Execute an action."""
         _LOGGER.info('Executing %s', name)
-        await script_obj.async_run(variables, context)
+        hass.components.logbook.async_log_entry(
+            name, 'has been triggered', DOMAIN, entity_id)
+
+        try:
+            await script_obj.async_run(variables, context)
+        except Exception as err:  # pylint: disable=broad-except
+            script_obj.async_log_exception(
+                _LOGGER,
+                'Error while executing automation {}'.format(entity_id), err)
 
     return action
 
diff --git a/homeassistant/components/binary_sensor/alarmdecoder.py b/homeassistant/components/binary_sensor/alarmdecoder.py
index 1b50d6c6c72..d8fddeaa540 100644
--- a/homeassistant/components/binary_sensor/alarmdecoder.py
+++ b/homeassistant/components/binary_sensor/alarmdecoder.py
@@ -9,7 +9,7 @@ import logging
 from homeassistant.components.binary_sensor import BinarySensorDevice
 from homeassistant.components.alarmdecoder import (
     ZONE_SCHEMA, CONF_ZONES, CONF_ZONE_NAME, CONF_ZONE_TYPE,
-    CONF_ZONE_RFID, SIGNAL_ZONE_FAULT, SIGNAL_ZONE_RESTORE,
+    CONF_ZONE_RFID, CONF_ZONE_LOOP, SIGNAL_ZONE_FAULT, SIGNAL_ZONE_RESTORE,
     SIGNAL_RFX_MESSAGE, SIGNAL_REL_MESSAGE, CONF_RELAY_ADDR,
     CONF_RELAY_CHAN)
 
@@ -37,10 +37,12 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         zone_type = device_config_data[CONF_ZONE_TYPE]
         zone_name = device_config_data[CONF_ZONE_NAME]
         zone_rfid = device_config_data.get(CONF_ZONE_RFID)
+        zone_loop = device_config_data.get(CONF_ZONE_LOOP)
         relay_addr = device_config_data.get(CONF_RELAY_ADDR)
         relay_chan = device_config_data.get(CONF_RELAY_CHAN)
         device = AlarmDecoderBinarySensor(
-            zone_num, zone_name, zone_type, zone_rfid, relay_addr, relay_chan)
+            zone_num, zone_name, zone_type, zone_rfid, zone_loop, relay_addr,
+            relay_chan)
         devices.append(device)
 
     add_entities(devices)
@@ -51,7 +53,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 class AlarmDecoderBinarySensor(BinarySensorDevice):
     """Representation of an AlarmDecoder binary sensor."""
 
-    def __init__(self, zone_number, zone_name, zone_type, zone_rfid,
+    def __init__(self, zone_number, zone_name, zone_type, zone_rfid, zone_loop,
                  relay_addr, relay_chan):
         """Initialize the binary_sensor."""
         self._zone_number = zone_number
@@ -59,6 +61,7 @@ class AlarmDecoderBinarySensor(BinarySensorDevice):
         self._state = None
         self._name = zone_name
         self._rfid = zone_rfid
+        self._loop = zone_loop
         self._rfstate = None
         self._relay_addr = relay_addr
         self._relay_chan = relay_chan
@@ -92,14 +95,14 @@ class AlarmDecoderBinarySensor(BinarySensorDevice):
         """Return the state attributes."""
         attr = {}
         if self._rfid and self._rfstate is not None:
-            attr[ATTR_RF_BIT0] = True if self._rfstate & 0x01 else False
-            attr[ATTR_RF_LOW_BAT] = True if self._rfstate & 0x02 else False
-            attr[ATTR_RF_SUPERVISED] = True if self._rfstate & 0x04 else False
-            attr[ATTR_RF_BIT3] = True if self._rfstate & 0x08 else False
-            attr[ATTR_RF_LOOP3] = True if self._rfstate & 0x10 else False
-            attr[ATTR_RF_LOOP2] = True if self._rfstate & 0x20 else False
-            attr[ATTR_RF_LOOP4] = True if self._rfstate & 0x40 else False
-            attr[ATTR_RF_LOOP1] = True if self._rfstate & 0x80 else False
+            attr[ATTR_RF_BIT0] = bool(self._rfstate & 0x01)
+            attr[ATTR_RF_LOW_BAT] = bool(self._rfstate & 0x02)
+            attr[ATTR_RF_SUPERVISED] = bool(self._rfstate & 0x04)
+            attr[ATTR_RF_BIT3] = bool(self._rfstate & 0x08)
+            attr[ATTR_RF_LOOP3] = bool(self._rfstate & 0x10)
+            attr[ATTR_RF_LOOP2] = bool(self._rfstate & 0x20)
+            attr[ATTR_RF_LOOP4] = bool(self._rfstate & 0x40)
+            attr[ATTR_RF_LOOP1] = bool(self._rfstate & 0x80)
         return attr
 
     @property
@@ -128,6 +131,8 @@ class AlarmDecoderBinarySensor(BinarySensorDevice):
         """Update RF state."""
         if self._rfid and message and message.serial_number == self._rfid:
             self._rfstate = message.value
+            if self._loop:
+                self._state = 1 if message.loop[self._loop - 1] else 0
             self.schedule_update_ha_state()
 
     def _rel_message_callback(self, message):
diff --git a/homeassistant/components/binary_sensor/esphome.py b/homeassistant/components/binary_sensor/esphome.py
new file mode 100644
index 00000000000..4796df636ba
--- /dev/null
+++ b/homeassistant/components/binary_sensor/esphome.py
@@ -0,0 +1,63 @@
+"""Support for ESPHome binary sensors."""
+import logging
+
+from typing import TYPE_CHECKING, Optional
+
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.components.esphome import EsphomeEntity, \
+    platform_async_setup_entry
+
+if TYPE_CHECKING:
+    # pylint: disable=unused-import
+    from aioesphomeapi import BinarySensorInfo, BinarySensorState  # noqa
+
+DEPENDENCIES = ['esphome']
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(hass, entry, async_add_entities):
+    """Set up ESPHome binary sensors based on a config entry."""
+    # pylint: disable=redefined-outer-name
+    from aioesphomeapi import BinarySensorInfo, BinarySensorState  # noqa
+
+    await platform_async_setup_entry(
+        hass, entry, async_add_entities,
+        component_key='binary_sensor',
+        info_type=BinarySensorInfo, entity_type=EsphomeBinarySensor,
+        state_type=BinarySensorState
+    )
+
+
+class EsphomeBinarySensor(EsphomeEntity, BinarySensorDevice):
+    """A binary sensor implementation for ESPHome."""
+
+    @property
+    def _static_info(self) -> 'BinarySensorInfo':
+        return super()._static_info
+
+    @property
+    def _state(self) -> Optional['BinarySensorState']:
+        return super()._state
+
+    @property
+    def is_on(self):
+        """Return true if the binary sensor is on."""
+        if self._static_info.is_status_binary_sensor:
+            # Status binary sensors indicated connected state.
+            # So in their case what's usually _availability_ is now state
+            return self._entry_data.available
+        if self._state is None:
+            return None
+        return self._state.state
+
+    @property
+    def device_class(self):
+        """Return the class of this device, from component DEVICE_CLASSES."""
+        return self._static_info.device_class
+
+    @property
+    def available(self):
+        """Return True if entity is available."""
+        if self._static_info.is_status_binary_sensor:
+            return True
+        return super().available
diff --git a/homeassistant/components/binary_sensor/fibaro.py b/homeassistant/components/binary_sensor/fibaro.py
index ae8029e13f8..8af2bde10ad 100644
--- a/homeassistant/components/binary_sensor/fibaro.py
+++ b/homeassistant/components/binary_sensor/fibaro.py
@@ -10,6 +10,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorDevice, ENTITY_ID_FORMAT)
 from homeassistant.components.fibaro import (
     FIBARO_CONTROLLER, FIBARO_DEVICES, FibaroDevice)
+from homeassistant.const import (CONF_DEVICE_CLASS, CONF_ICON)
 
 DEPENDENCIES = ['fibaro']
 
@@ -45,6 +46,7 @@ class FibaroBinarySensor(FibaroDevice, BinarySensorDevice):
         super().__init__(fibaro_device, controller)
         self.entity_id = ENTITY_ID_FORMAT.format(self.ha_id)
         stype = None
+        devconf = fibaro_device.device_config
         if fibaro_device.type in SENSOR_TYPES:
             stype = fibaro_device.type
         elif fibaro_device.baseType in SENSOR_TYPES:
@@ -55,6 +57,10 @@ class FibaroBinarySensor(FibaroDevice, BinarySensorDevice):
         else:
             self._device_class = None
             self._icon = None
+        # device_config overrides:
+        self._device_class = devconf.get(CONF_DEVICE_CLASS,
+                                         self._device_class)
+        self._icon = devconf.get(CONF_ICON, self._icon)
 
     @property
     def icon(self):
diff --git a/homeassistant/components/binary_sensor/hikvision.py b/homeassistant/components/binary_sensor/hikvision.py
index 78e8f9a973e..57618ca2652 100644
--- a/homeassistant/components/binary_sensor/hikvision.py
+++ b/homeassistant/components/binary_sensor/hikvision.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
     CONF_SSL, EVENT_HOMEASSISTANT_STOP, EVENT_HOMEASSISTANT_START,
     ATTR_LAST_TRIP_TIME, CONF_CUSTOMIZE)
 
-REQUIREMENTS = ['pyhik==0.1.8']
+REQUIREMENTS = ['pyhik==0.1.9']
 _LOGGER = logging.getLogger(__name__)
 
 CONF_IGNORED = 'ignored'
diff --git a/homeassistant/components/binary_sensor/homematicip_cloud.py b/homeassistant/components/binary_sensor/homematicip_cloud.py
index 6c8b7ff191e..aba979b94f2 100644
--- a/homeassistant/components/binary_sensor/homematicip_cloud.py
+++ b/homeassistant/components/binary_sensor/homematicip_cloud.py
@@ -28,14 +28,16 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the HomematicIP Cloud binary sensor from a config entry."""
     from homematicip.aio.device import (
         AsyncShutterContact, AsyncMotionDetectorIndoor, AsyncSmokeDetector,
-        AsyncWaterSensor, AsyncRotaryHandleSensor)
+        AsyncWaterSensor, AsyncRotaryHandleSensor,
+        AsyncMotionDetectorPushButton)
 
     home = hass.data[HMIPC_DOMAIN][config_entry.data[HMIPC_HAPID]].home
     devices = []
     for device in home.devices:
         if isinstance(device, (AsyncShutterContact, AsyncRotaryHandleSensor)):
             devices.append(HomematicipShutterContact(home, device))
-        elif isinstance(device, AsyncMotionDetectorIndoor):
+        elif isinstance(device, (AsyncMotionDetectorIndoor,
+                                 AsyncMotionDetectorPushButton)):
             devices.append(HomematicipMotionDetector(home, device))
         elif isinstance(device, AsyncSmokeDetector):
             devices.append(HomematicipSmokeDetector(home, device))
diff --git a/homeassistant/components/binary_sensor/insteon.py b/homeassistant/components/binary_sensor/insteon.py
index 009de676bf3..5b0a291e92b 100644
--- a/homeassistant/components/binary_sensor/insteon.py
+++ b/homeassistant/components/binary_sensor/insteon.py
@@ -14,6 +14,7 @@ DEPENDENCIES = ['insteon']
 _LOGGER = logging.getLogger(__name__)
 
 SENSOR_TYPES = {'openClosedSensor': 'opening',
+                'ioLincSensor': 'opening',
                 'motionSensor': 'motion',
                 'doorSensor': 'door',
                 'wetLeakSensor': 'moisture',
@@ -58,7 +59,7 @@ class InsteonBinarySensor(InsteonEntity, BinarySensorDevice):
         on_val = bool(self._insteon_device_state.value)
 
         if self._insteon_device_state.name in ['lightSensor',
-                                               'openClosedSensor']:
+                                               'ioLincSensor']:
             return not on_val
 
         return on_val
diff --git a/homeassistant/components/binary_sensor/isy994.py b/homeassistant/components/binary_sensor/isy994.py
index 31a9606d950..b5d676f233f 100644
--- a/homeassistant/components/binary_sensor/isy994.py
+++ b/homeassistant/components/binary_sensor/isy994.py
@@ -52,7 +52,7 @@ def setup_platform(hass, config: ConfigType,
                           node.nid, node.parent_nid)
         else:
             device_type = _detect_device_type(node)
-            subnode_id = int(node.nid[-1])
+            subnode_id = int(node.nid[-1], 16)
             if device_type in ('opening', 'moisture'):
                 # These sensors use an optional "negative" subnode 2 to snag
                 # all state changes
diff --git a/homeassistant/components/binary_sensor/mqtt.py b/homeassistant/components/binary_sensor/mqtt.py
index acbad0d0419..0a09d051192 100644
--- a/homeassistant/components/binary_sensor/mqtt.py
+++ b/homeassistant/components/binary_sensor/mqtt.py
@@ -16,10 +16,10 @@ from homeassistant.const import (
     CONF_FORCE_UPDATE, CONF_NAME, CONF_VALUE_TEMPLATE, CONF_PAYLOAD_ON,
     CONF_PAYLOAD_OFF, CONF_DEVICE_CLASS, CONF_DEVICE)
 from homeassistant.components.mqtt import (
-    ATTR_DISCOVERY_HASH, CONF_STATE_TOPIC, CONF_AVAILABILITY_TOPIC,
+    ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC,
     CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS,
-    MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo,
-    subscription)
+    MqttAttributes, MqttAvailability, MqttDiscoveryUpdate,
+    MqttEntityDeviceInfo, subscription)
 from homeassistant.components.mqtt.discovery import MQTT_DISCOVERY_NEW
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -49,7 +49,8 @@ PLATFORM_SCHEMA = mqtt.MQTT_RO_PLATFORM_SCHEMA.extend({
     # This is an exception because MQTT is a message transport, not a protocol
     vol.Optional(CONF_UNIQUE_ID): cv.string,
     vol.Optional(CONF_DEVICE): mqtt.MQTT_ENTITY_DEVICE_INFO_SCHEMA,
-}).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
+}).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema).extend(
+    mqtt.MQTT_JSON_ATTRS_SCHEMA.schema)
 
 
 async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
@@ -76,7 +77,7 @@ async def _async_setup_entity(config, async_add_entities, discovery_hash=None):
     async_add_entities([MqttBinarySensor(config, discovery_hash)])
 
 
-class MqttBinarySensor(MqttAvailability, MqttDiscoveryUpdate,
+class MqttBinarySensor(MqttAttributes, MqttAvailability, MqttDiscoveryUpdate,
                        MqttEntityDeviceInfo, BinarySensorDevice):
     """Representation a binary sensor that is updated by MQTT."""
 
@@ -94,6 +95,7 @@ class MqttBinarySensor(MqttAvailability, MqttDiscoveryUpdate,
         qos = config.get(CONF_QOS)
         device_config = config.get(CONF_DEVICE)
 
+        MqttAttributes.__init__(self, config)
         MqttAvailability.__init__(self, availability_topic, qos,
                                   payload_available, payload_not_available)
         MqttDiscoveryUpdate.__init__(self, discovery_hash,
@@ -109,6 +111,7 @@ class MqttBinarySensor(MqttAvailability, MqttDiscoveryUpdate,
         """Handle updated discovery message."""
         config = PLATFORM_SCHEMA(discovery_payload)
         self._config = config
+        await self.attributes_discovery_update(config)
         await self.availability_discovery_update(config)
         await self._subscribe_topics()
         self.async_schedule_update_ha_state()
@@ -132,7 +135,7 @@ class MqttBinarySensor(MqttAvailability, MqttDiscoveryUpdate,
             value_template = self._config.get(CONF_VALUE_TEMPLATE)
             if value_template is not None:
                 payload = value_template.async_render_with_possible_json_value(
-                    payload)
+                    payload, variables={'entity_id': self.entity_id})
             if payload == self._config.get(CONF_PAYLOAD_ON):
                 self._state = True
             elif payload == self._config.get(CONF_PAYLOAD_OFF):
@@ -163,7 +166,9 @@ class MqttBinarySensor(MqttAvailability, MqttDiscoveryUpdate,
 
     async def async_will_remove_from_hass(self):
         """Unsubscribe when removed."""
-        await subscription.async_unsubscribe_topics(self.hass, self._sub_state)
+        self._sub_state = await subscription.async_unsubscribe_topics(
+            self.hass, self._sub_state)
+        await MqttAttributes.async_will_remove_from_hass(self)
         await MqttAvailability.async_will_remove_from_hass(self)
 
     @property
diff --git a/homeassistant/components/binary_sensor/mystrom.py b/homeassistant/components/binary_sensor/mystrom.py
index 5785ed464fd..4927be27eb3 100644
--- a/homeassistant/components/binary_sensor/mystrom.py
+++ b/homeassistant/components/binary_sensor/mystrom.py
@@ -61,8 +61,7 @@ class MyStromView(HomeAssistantView):
                 '{}_{}'.format(button_id, button_action))
             self.add_entities([self.buttons[entity_id]])
         else:
-            new_state = True if self.buttons[entity_id].state == 'off' \
-                else False
+            new_state = self.buttons[entity_id].state == 'off'
             self.buttons[entity_id].async_on_update(new_state)
 
 
diff --git a/homeassistant/components/binary_sensor/ness_alarm.py b/homeassistant/components/binary_sensor/ness_alarm.py
new file mode 100644
index 00000000000..9f1479efd69
--- /dev/null
+++ b/homeassistant/components/binary_sensor/ness_alarm.py
@@ -0,0 +1,81 @@
+"""
+Support for Ness D8X/D16X zone states - represented as binary sensors.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/binary_sensor.ness_alarm/
+"""
+import logging
+
+from homeassistant.components.binary_sensor import BinarySensorDevice
+from homeassistant.components.ness_alarm import (
+    CONF_ZONES, CONF_ZONE_TYPE, CONF_ZONE_NAME, CONF_ZONE_ID,
+    SIGNAL_ZONE_CHANGED, ZoneChangedData)
+from homeassistant.core import callback
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
+
+DEPENDENCIES = ['ness_alarm']
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Set up the Ness Alarm binary sensor devices."""
+    if not discovery_info:
+        return
+
+    configured_zones = discovery_info[CONF_ZONES]
+
+    devices = []
+
+    for zone_config in configured_zones:
+        zone_type = zone_config[CONF_ZONE_TYPE]
+        zone_name = zone_config[CONF_ZONE_NAME]
+        zone_id = zone_config[CONF_ZONE_ID]
+        device = NessZoneBinarySensor(zone_id=zone_id, name=zone_name,
+                                      zone_type=zone_type)
+        devices.append(device)
+
+    async_add_entities(devices)
+
+
+class NessZoneBinarySensor(BinarySensorDevice):
+    """Representation of an Ness alarm zone as a binary sensor."""
+
+    def __init__(self, zone_id, name, zone_type):
+        """Initialize the binary_sensor."""
+        self._zone_id = zone_id
+        self._name = name
+        self._type = zone_type
+        self._state = 0
+
+    async def async_added_to_hass(self):
+        """Register callbacks."""
+        async_dispatcher_connect(
+            self.hass, SIGNAL_ZONE_CHANGED, self._handle_zone_change)
+
+    @property
+    def name(self):
+        """Return the name of the entity."""
+        return self._name
+
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False
+
+    @property
+    def is_on(self):
+        """Return true if sensor is on."""
+        return self._state == 1
+
+    @property
+    def device_class(self):
+        """Return the class of this sensor, from DEVICE_CLASSES."""
+        return self._type
+
+    @callback
+    def _handle_zone_change(self, data: ZoneChangedData):
+        """Handle zone state update."""
+        if self._zone_id == data.zone_id:
+            self._state = data.state
+            self.async_schedule_update_ha_state()
diff --git a/homeassistant/components/binary_sensor/point.py b/homeassistant/components/binary_sensor/point.py
index 29488d08130..1bd97ce2747 100644
--- a/homeassistant/components/binary_sensor/point.py
+++ b/homeassistant/components/binary_sensor/point.py
@@ -7,8 +7,7 @@ https://home-assistant.io/components/binary_sensor.point/
 
 import logging
 
-from homeassistant.components.binary_sensor import (
-    DOMAIN as PARENT_DOMAIN, BinarySensorDevice)
+from homeassistant.components.binary_sensor import DOMAIN, BinarySensorDevice
 from homeassistant.components.point import MinutPointEntity
 from homeassistant.components.point.const import (
     DOMAIN as POINT_DOMAIN, POINT_DISCOVERY_NEW, SIGNAL_WEBHOOK)
@@ -49,7 +48,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
              for device_class in EVENTS), True)
 
     async_dispatcher_connect(
-        hass, POINT_DISCOVERY_NEW.format(PARENT_DOMAIN, POINT_DOMAIN),
+        hass, POINT_DISCOVERY_NEW.format(DOMAIN, POINT_DOMAIN),
         async_discover_sensor)
 
 
diff --git a/homeassistant/components/binary_sensor/satel_integra.py b/homeassistant/components/binary_sensor/satel_integra.py
index 8aff02d55a7..b4541cf2c44 100644
--- a/homeassistant/components/binary_sensor/satel_integra.py
+++ b/homeassistant/components/binary_sensor/satel_integra.py
@@ -8,9 +8,11 @@ import logging
 
 from homeassistant.components.binary_sensor import BinarySensorDevice
 from homeassistant.components.satel_integra import (CONF_ZONES,
+                                                    CONF_OUTPUTS,
                                                     CONF_ZONE_NAME,
                                                     CONF_ZONE_TYPE,
-                                                    SIGNAL_ZONES_UPDATED)
+                                                    SIGNAL_ZONES_UPDATED,
+                                                    SIGNAL_OUTPUTS_UPDATED)
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
@@ -32,7 +34,17 @@ async def async_setup_platform(hass, config, async_add_entities,
     for zone_num, device_config_data in configured_zones.items():
         zone_type = device_config_data[CONF_ZONE_TYPE]
         zone_name = device_config_data[CONF_ZONE_NAME]
-        device = SatelIntegraBinarySensor(zone_num, zone_name, zone_type)
+        device = SatelIntegraBinarySensor(zone_num, zone_name, zone_type,
+                                          SIGNAL_ZONES_UPDATED)
+        devices.append(device)
+
+    configured_outputs = discovery_info[CONF_OUTPUTS]
+
+    for zone_num, device_config_data in configured_outputs.items():
+        zone_type = device_config_data[CONF_ZONE_TYPE]
+        zone_name = device_config_data[CONF_ZONE_NAME]
+        device = SatelIntegraBinarySensor(zone_num, zone_name, zone_type,
+                                          SIGNAL_OUTPUTS_UPDATED)
         devices.append(device)
 
     async_add_entities(devices)
@@ -41,17 +53,18 @@ async def async_setup_platform(hass, config, async_add_entities,
 class SatelIntegraBinarySensor(BinarySensorDevice):
     """Representation of an Satel Integra binary sensor."""
 
-    def __init__(self, zone_number, zone_name, zone_type):
+    def __init__(self, device_number, device_name, zone_type, react_to_signal):
         """Initialize the binary_sensor."""
-        self._zone_number = zone_number
-        self._name = zone_name
+        self._device_number = device_number
+        self._name = device_name
         self._zone_type = zone_type
         self._state = 0
+        self._react_to_signal = react_to_signal
 
     async def async_added_to_hass(self):
         """Register callbacks."""
         async_dispatcher_connect(
-            self.hass, SIGNAL_ZONES_UPDATED, self._zones_updated)
+            self.hass, self._react_to_signal, self._devices_updated)
 
     @property
     def name(self):
@@ -80,9 +93,9 @@ class SatelIntegraBinarySensor(BinarySensorDevice):
         return self._zone_type
 
     @callback
-    def _zones_updated(self, zones):
+    def _devices_updated(self, zones):
         """Update the zone's state, if needed."""
-        if self._zone_number in zones \
-                and self._state != zones[self._zone_number]:
-            self._state = zones[self._zone_number]
+        if self._device_number in zones \
+                and self._state != zones[self._device_number]:
+            self._state = zones[self._device_number]
             self.async_schedule_update_ha_state()
diff --git a/homeassistant/components/binary_sensor/tellduslive.py b/homeassistant/components/binary_sensor/tellduslive.py
index 7f60e40c68b..f6ed85db132 100644
--- a/homeassistant/components/binary_sensor/tellduslive.py
+++ b/homeassistant/components/binary_sensor/tellduslive.py
@@ -9,22 +9,35 @@ https://home-assistant.io/components/binary_sensor.tellduslive/
 """
 import logging
 
-from homeassistant.components import tellduslive
+from homeassistant.components import binary_sensor, tellduslive
 from homeassistant.components.binary_sensor import BinarySensorDevice
 from homeassistant.components.tellduslive.entry import TelldusLiveEntity
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 _LOGGER = logging.getLogger(__name__)
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up Tellstick sensors."""
-    if discovery_info is None:
-        return
-    client = hass.data[tellduslive.DOMAIN]
-    add_entities(
-        TelldusLiveSensor(client, binary_sensor)
-        for binary_sensor in discovery_info
-    )
+    """Old way of setting up TelldusLive.
+
+    Can only be called when a user accidentally mentions the platform in their
+    config. But even in that case it would have been ignored.
+    """
+    pass
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up tellduslive sensors dynamically."""
+    async def async_discover_binary_sensor(device_id):
+        """Discover and add a discovered sensor."""
+        client = hass.data[tellduslive.DOMAIN]
+        async_add_entities([TelldusLiveSensor(client, device_id)])
+
+    async_dispatcher_connect(
+        hass,
+        tellduslive.TELLDUS_DISCOVERY_NEW.format(binary_sensor.DOMAIN,
+                                                 tellduslive.DOMAIN),
+        async_discover_binary_sensor)
 
 
 class TelldusLiveSensor(TelldusLiveEntity, BinarySensorDevice):
diff --git a/homeassistant/components/binary_sensor/wemo.py b/homeassistant/components/binary_sensor/wemo.py
index 1071aae50dd..e44cbb31e66 100644
--- a/homeassistant/components/binary_sensor/wemo.py
+++ b/homeassistant/components/binary_sensor/wemo.py
@@ -4,7 +4,10 @@ Support for WeMo sensors.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/binary_sensor.wemo/
 """
+import asyncio
 import logging
+
+import async_timeout
 import requests
 
 from homeassistant.components.binary_sensor import BinarySensorDevice
@@ -15,7 +18,7 @@ DEPENDENCIES = ['wemo']
 _LOGGER = logging.getLogger(__name__)
 
 
-def setup_platform(hass, config, add_entities_callback, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Register discovered WeMo binary sensors."""
     from pywemo import discovery
 
@@ -31,7 +34,7 @@ def setup_platform(hass, config, add_entities_callback, discovery_info=None):
             raise PlatformNotReady
 
         if device:
-            add_entities_callback([WemoBinarySensor(hass, device)])
+            add_entities([WemoBinarySensor(hass, device)])
 
 
 class WemoBinarySensor(BinarySensorDevice):
@@ -41,48 +44,90 @@ class WemoBinarySensor(BinarySensorDevice):
         """Initialize the WeMo sensor."""
         self.wemo = device
         self._state = None
+        self._available = True
+        self._update_lock = None
+        self._model_name = self.wemo.model_name
+        self._name = self.wemo.name
+        self._serialnumber = self.wemo.serialnumber
 
-        wemo = hass.components.wemo
-        wemo.SUBSCRIPTION_REGISTRY.register(self.wemo)
-        wemo.SUBSCRIPTION_REGISTRY.on(self.wemo, None, self._update_callback)
-
-    def _update_callback(self, _device, _type, _params):
-        """Handle state changes."""
-        _LOGGER.info("Subscription update for %s", _device)
+    def _subscription_callback(self, _device, _type, _params):
+        """Update the state by the Wemo sensor."""
+        _LOGGER.debug("Subscription update for %s", self.name)
         updated = self.wemo.subscription_update(_type, _params)
-        self._update(force_update=(not updated))
+        self.hass.add_job(
+            self._async_locked_subscription_callback(not updated))
 
-        if not hasattr(self, 'hass'):
+    async def _async_locked_subscription_callback(self, force_update):
+        """Handle an update from a subscription."""
+        # If an update is in progress, we don't do anything
+        if self._update_lock.locked():
             return
-        self.schedule_update_ha_state()
 
-    @property
-    def should_poll(self):
-        """No polling needed with subscriptions."""
-        return False
+        await self._async_locked_update(force_update)
+        self.async_schedule_update_ha_state()
+
+    async def async_added_to_hass(self):
+        """Wemo sensor added to HASS."""
+        # Define inside async context so we know our event loop
+        self._update_lock = asyncio.Lock()
+
+        registry = self.hass.components.wemo.SUBSCRIPTION_REGISTRY
+        await self.hass.async_add_executor_job(registry.register, self.wemo)
+        registry.on(self.wemo, None, self._subscription_callback)
+
+    async def async_update(self):
+        """Update WeMo state.
+
+        Wemo has an aggressive retry logic that sometimes can take over a
+        minute to return. If we don't get a state after 5 seconds, assume the
+        Wemo sensor is unreachable. If update goes through, it will be made
+        available again.
+        """
+        # If an update is in progress, we don't do anything
+        if self._update_lock.locked():
+            return
+
+        try:
+            with async_timeout.timeout(5):
+                await asyncio.shield(self._async_locked_update(True))
+        except asyncio.TimeoutError:
+            _LOGGER.warning('Lost connection to %s', self.name)
+            self._available = False
+
+    async def _async_locked_update(self, force_update):
+        """Try updating within an async lock."""
+        async with self._update_lock:
+            await self.hass.async_add_executor_job(self._update, force_update)
+
+    def _update(self, force_update=True):
+        """Update the sensor state."""
+        try:
+            self._state = self.wemo.get_state(force_update)
+
+            if not self._available:
+                _LOGGER.info('Reconnected to %s', self.name)
+                self._available = True
+        except AttributeError as err:
+            _LOGGER.warning("Could not update status for %s (%s)",
+                            self.name, err)
+            self._available = False
 
     @property
     def unique_id(self):
-        """Return the id of this WeMo device."""
-        return self.wemo.serialnumber
+        """Return the id of this WeMo sensor."""
+        return self._serialnumber
 
     @property
     def name(self):
         """Return the name of the service if any."""
-        return self.wemo.name
+        return self._name
 
     @property
     def is_on(self):
         """Return true if sensor is on."""
         return self._state
 
-    def update(self):
-        """Update WeMo state."""
-        self._update(force_update=True)
-
-    def _update(self, force_update=True):
-        try:
-            self._state = self.wemo.get_state(force_update)
-        except AttributeError as err:
-            _LOGGER.warning(
-                "Could not update status for %s (%s)", self.name, err)
+    @property
+    def available(self):
+        """Return true if sensor is available."""
+        return self._available
diff --git a/homeassistant/components/binary_sensor/xiaomi_aqara.py b/homeassistant/components/binary_sensor/xiaomi_aqara.py
index becbfe38163..de259c718f4 100644
--- a/homeassistant/components/binary_sensor/xiaomi_aqara.py
+++ b/homeassistant/components/binary_sensor/xiaomi_aqara.py
@@ -409,10 +409,14 @@ class XiaomiButton(XiaomiBinarySensor):
             click_type = 'double'
         elif value == 'both_click':
             click_type = 'both'
+        elif value == 'double_both_click':
+            click_type = 'double_both'
         elif value == 'shake':
             click_type = 'shake'
-        elif value in ['long_click', 'long_both_click']:
-            return False
+        elif value == 'long_click':
+            click_type = 'long'
+        elif value == 'long_both_click':
+            click_type = 'long_both'
         else:
             _LOGGER.warning("Unsupported click_type detected: %s", value)
             return False
@@ -465,4 +469,12 @@ class XiaomiCube(XiaomiBinarySensor):
             })
             self._last_action = 'rotate'
 
+        if 'rotate_degree' in data:
+            self._hass.bus.fire('xiaomi_aqara.cube_action', {
+                'entity_id': self.entity_id,
+                'action_type': 'rotate',
+                'action_value': float(data['rotate_degree'].replace(",", "."))
+            })
+            self._last_action = 'rotate'
+
         return True
diff --git a/homeassistant/components/binary_sensor/zha.py b/homeassistant/components/binary_sensor/zha.py
index 62c57f0288b..0d426f0aa14 100644
--- a/homeassistant/components/binary_sensor/zha.py
+++ b/homeassistant/components/binary_sensor/zha.py
@@ -9,9 +9,14 @@ import logging
 from homeassistant.components.binary_sensor import DOMAIN, BinarySensorDevice
 from homeassistant.components.zha import helpers
 from homeassistant.components.zha.const import (
-    DATA_ZHA, DATA_ZHA_DISPATCHERS, ZHA_DISCOVERY_NEW)
+    DATA_ZHA, DATA_ZHA_DISPATCHERS, REPORT_CONFIG_IMMEDIATE, ZHA_DISCOVERY_NEW)
 from homeassistant.components.zha.entities import ZhaEntity
+from homeassistant.const import STATE_ON
+from homeassistant.components.zha.entities.listeners import (
+    OnOffListener, LevelListener
+)
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
+from homeassistant.helpers.restore_state import RestoreEntity
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -26,6 +31,7 @@ CLASS_MAPPING = {
     0x002b: 'gas',
     0x002d: 'vibration',
 }
+DEVICE_CLASS_OCCUPANCY = 'occupancy'
 
 
 async def async_setup_platform(hass, config, async_add_entities,
@@ -54,14 +60,19 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 async def _async_setup_entities(hass, config_entry, async_add_entities,
                                 discovery_infos):
     """Set up the ZHA binary sensors."""
+    from zigpy.zcl.clusters.general import OnOff
+    from zigpy.zcl.clusters.measurement import OccupancySensing
+    from zigpy.zcl.clusters.security import IasZone
+
     entities = []
     for discovery_info in discovery_infos:
-        from zigpy.zcl.clusters.general import OnOff
-        from zigpy.zcl.clusters.security import IasZone
         if IasZone.cluster_id in discovery_info['in_clusters']:
             entities.append(await _async_setup_iaszone(discovery_info))
+        elif OccupancySensing.cluster_id in discovery_info['in_clusters']:
+            entities.append(
+                BinarySensor(DEVICE_CLASS_OCCUPANCY, **discovery_info))
         elif OnOff.cluster_id in discovery_info['out_clusters']:
-            entities.append(await _async_setup_remote(discovery_info))
+            entities.append(Remote(**discovery_info))
 
     async_add_entities(entities, update_before_add=True)
 
@@ -70,10 +81,6 @@ async def _async_setup_iaszone(discovery_info):
     device_class = None
     from zigpy.zcl.clusters.security import IasZone
     cluster = discovery_info['in_clusters'][IasZone.cluster_id]
-    if discovery_info['new_join']:
-        await cluster.bind()
-        ieee = cluster.endpoint.device.application.ieee
-        await cluster.write_attributes({'cie_addr': ieee})
 
     try:
         zone_type = await cluster['zone_type']
@@ -82,33 +89,11 @@ async def _async_setup_iaszone(discovery_info):
         # If we fail to read from the device, use a non-specific class
         pass
 
-    return BinarySensor(device_class, **discovery_info)
+    return IasZoneSensor(device_class, **discovery_info)
 
 
-async def _async_setup_remote(discovery_info):
-    remote = Remote(**discovery_info)
-
-    if discovery_info['new_join']:
-        from zigpy.zcl.clusters.general import OnOff, LevelControl
-        out_clusters = discovery_info['out_clusters']
-        if OnOff.cluster_id in out_clusters:
-            cluster = out_clusters[OnOff.cluster_id]
-            await helpers.configure_reporting(
-                remote.entity_id, cluster, 0, min_report=0, max_report=600,
-                reportable_change=1
-            )
-        if LevelControl.cluster_id in out_clusters:
-            cluster = out_clusters[LevelControl.cluster_id]
-            await helpers.configure_reporting(
-                remote.entity_id, cluster, 0, min_report=1, max_report=600,
-                reportable_change=1
-            )
-
-    return remote
-
-
-class BinarySensor(ZhaEntity, BinarySensorDevice):
-    """The ZHA Binary Sensor."""
+class IasZoneSensor(RestoreEntity, ZhaEntity, BinarySensorDevice):
+    """The IasZoneSensor Binary Sensor."""
 
     _domain = DOMAIN
 
@@ -119,11 +104,6 @@ class BinarySensor(ZhaEntity, BinarySensorDevice):
         from zigpy.zcl.clusters.security import IasZone
         self._ias_zone_cluster = self._in_clusters[IasZone.cluster_id]
 
-    @property
-    def should_poll(self) -> bool:
-        """Let zha handle polling."""
-        return False
-
     @property
     def is_on(self) -> bool:
         """Return True if entity is on."""
@@ -147,6 +127,26 @@ class BinarySensor(ZhaEntity, BinarySensorDevice):
             res = self._ias_zone_cluster.enroll_response(0, 0)
             self.hass.async_add_job(res)
 
+    async def async_added_to_hass(self):
+        """Run when about to be added to hass."""
+        await super().async_added_to_hass()
+        old_state = await self.async_get_last_state()
+        if self._state is not None or old_state is None:
+            return
+
+        _LOGGER.debug("%s restoring old state: %s", self.entity_id, old_state)
+        if old_state.state == STATE_ON:
+            self._state = 3
+        else:
+            self._state = 0
+
+    async def async_configure(self):
+        """Configure IAS device."""
+        await self._ias_zone_cluster.bind()
+        ieee = self._ias_zone_cluster.endpoint.device.application.ieee
+        await self._ias_zone_cluster.write_attributes({'cie_addr': ieee})
+        _LOGGER.debug("%s: finished configuration", self.entity_id)
+
     async def async_update(self):
         """Retrieve latest state."""
         from zigpy.types.basic import uint16_t
@@ -160,81 +160,33 @@ class BinarySensor(ZhaEntity, BinarySensorDevice):
             self._state = result.get('zone_status', self._state) & 3
 
 
-class Remote(ZhaEntity, BinarySensorDevice):
+class Remote(RestoreEntity, ZhaEntity, BinarySensorDevice):
     """ZHA switch/remote controller/button."""
 
     _domain = DOMAIN
 
-    class OnOffListener:
-        """Listener for the OnOff Zigbee cluster."""
-
-        def __init__(self, entity):
-            """Initialize OnOffListener."""
-            self._entity = entity
-
-        def cluster_command(self, tsn, command_id, args):
-            """Handle commands received to this cluster."""
-            if command_id in (0x0000, 0x0040):
-                self._entity.set_state(False)
-            elif command_id in (0x0001, 0x0041, 0x0042):
-                self._entity.set_state(True)
-            elif command_id == 0x0002:
-                self._entity.set_state(not self._entity.is_on)
-
-        def attribute_updated(self, attrid, value):
-            """Handle attribute updates on this cluster."""
-            if attrid == 0:
-                self._entity.set_state(value)
-
-        def zdo_command(self, *args, **kwargs):
-            """Handle ZDO commands on this cluster."""
-            pass
-
-    class LevelListener:
-        """Listener for the LevelControl Zigbee cluster."""
-
-        def __init__(self, entity):
-            """Initialize LevelListener."""
-            self._entity = entity
-
-        def cluster_command(self, tsn, command_id, args):
-            """Handle commands received to this cluster."""
-            if command_id in (0x0000, 0x0004):  # move_to_level, -with_on_off
-                self._entity.set_level(args[0])
-            elif command_id in (0x0001, 0x0005):  # move, -with_on_off
-                # We should dim slowly -- for now, just step once
-                rate = args[1]
-                if args[0] == 0xff:
-                    rate = 10  # Should read default move rate
-                self._entity.move_level(-rate if args[0] else rate)
-            elif command_id in (0x0002, 0x0006):  # step, -with_on_off
-                # Step (technically may change on/off)
-                self._entity.move_level(-args[1] if args[0] else args[1])
-
-        def attribute_update(self, attrid, value):
-            """Handle attribute updates on this cluster."""
-            if attrid == 0:
-                self._entity.set_level(value)
-
-        def zdo_command(self, *args, **kwargs):
-            """Handle ZDO commands on this cluster."""
-            pass
-
     def __init__(self, **kwargs):
         """Initialize Switch."""
         super().__init__(**kwargs)
-        self._state = False
         self._level = 0
         from zigpy.zcl.clusters import general
         self._out_listeners = {
-            general.OnOff.cluster_id: self.OnOffListener(self),
-            general.LevelControl.cluster_id: self.LevelListener(self),
+            general.OnOff.cluster_id: OnOffListener(
+                self,
+                self._out_clusters[general.OnOff.cluster_id]
+            )
         }
 
-    @property
-    def should_poll(self) -> bool:
-        """Let zha handle polling."""
-        return False
+        out_clusters = kwargs.get('out_clusters')
+        self._zcl_reporting = {}
+
+        if general.LevelControl.cluster_id in out_clusters:
+            self._out_listeners.update({
+                general.LevelControl.cluster_id: LevelListener(
+                    self,
+                    out_clusters[general.LevelControl.cluster_id]
+                )
+            })
 
     @property
     def is_on(self) -> bool:
@@ -249,6 +201,11 @@ class Remote(ZhaEntity, BinarySensorDevice):
         })
         return self._device_state_attributes
 
+    @property
+    def zcl_reporting_config(self):
+        """Return ZCL attribute reporting configuration."""
+        return self._zcl_reporting
+
     def move_level(self, change):
         """Increment the level, setting state if appropriate."""
         if not self._state and change > 0:
@@ -270,6 +227,31 @@ class Remote(ZhaEntity, BinarySensorDevice):
             self._level = 255
         self.async_schedule_update_ha_state()
 
+    async def async_configure(self):
+        """Bind clusters."""
+        from zigpy.zcl.clusters import general
+        await helpers.bind_cluster(
+            self.entity_id,
+            self._out_clusters[general.OnOff.cluster_id]
+        )
+        if general.LevelControl.cluster_id in self._out_clusters:
+            await helpers.bind_cluster(
+                self.entity_id,
+                self._out_clusters[general.LevelControl.cluster_id]
+            )
+
+    async def async_added_to_hass(self):
+        """Run when about to be added to hass."""
+        await super().async_added_to_hass()
+        old_state = await self.async_get_last_state()
+        if self._state is not None or old_state is None:
+            return
+
+        _LOGGER.debug("%s restoring old state: %s", self.entity_id, old_state)
+        if 'level' in old_state.attributes:
+            self._level = old_state.attributes['level']
+        self._state = old_state.state == STATE_ON
+
     async def async_update(self):
         """Retrieve latest state."""
         from zigpy.zcl.clusters.general import OnOff
@@ -280,3 +262,56 @@ class Remote(ZhaEntity, BinarySensorDevice):
             only_cache=(not self._initialized)
         )
         self._state = result.get('on_off', self._state)
+
+
+class BinarySensor(RestoreEntity, ZhaEntity, BinarySensorDevice):
+    """ZHA switch."""
+
+    _domain = DOMAIN
+    _device_class = None
+    value_attribute = 0
+
+    def __init__(self, device_class, **kwargs):
+        """Initialize the ZHA binary sensor."""
+        super().__init__(**kwargs)
+        self._device_class = device_class
+        self._cluster = list(kwargs['in_clusters'].values())[0]
+
+    def attribute_updated(self, attribute, value):
+        """Handle attribute update from device."""
+        _LOGGER.debug("Attribute updated: %s %s %s", self, attribute, value)
+        if attribute == self.value_attribute:
+            self._state = bool(value)
+            self.async_schedule_update_ha_state()
+
+    async def async_added_to_hass(self):
+        """Run when about to be added to hass."""
+        await super().async_added_to_hass()
+        old_state = await self.async_get_last_state()
+        if self._state is not None or old_state is None:
+            return
+
+        _LOGGER.debug("%s restoring old state: %s", self.entity_id, old_state)
+        self._state = old_state.state == STATE_ON
+
+    @property
+    def cluster(self):
+        """Zigbee cluster for this entity."""
+        return self._cluster
+
+    @property
+    def zcl_reporting_config(self):
+        """ZHA reporting configuration."""
+        return {self.cluster: {self.value_attribute: REPORT_CONFIG_IMMEDIATE}}
+
+    @property
+    def is_on(self) -> bool:
+        """Return if the switch is on based on the statemachine."""
+        if self._state is None:
+            return False
+        return self._state
+
+    @property
+    def device_class(self) -> str:
+        """Return device class from component DEVICE_CLASSES."""
+        return self._device_class
diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py
index 0463b172d7a..653d0315ad4 100644
--- a/homeassistant/components/camera/__init__.py
+++ b/homeassistant/components/camera/__init__.py
@@ -61,7 +61,7 @@ FALLBACK_STREAM_INTERVAL = 1  # seconds
 MIN_STREAM_INTERVAL = 0.5  # seconds
 
 CAMERA_SERVICE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
 })
 
 CAMERA_SERVICE_SNAPSHOT = CAMERA_SERVICE_SCHEMA.extend({
diff --git a/homeassistant/components/camera/axis.py b/homeassistant/components/camera/axis.py
index 4227cca7e2f..9846ae85fb2 100644
--- a/homeassistant/components/camera/axis.py
+++ b/homeassistant/components/camera/axis.py
@@ -7,7 +7,7 @@ https://home-assistant.io/components/camera.axis/
 import logging
 
 from homeassistant.components.camera.mjpeg import (
-    CONF_MJPEG_URL, CONF_STILL_IMAGE_URL, MjpegCamera)
+    CONF_MJPEG_URL, CONF_STILL_IMAGE_URL, MjpegCamera, filter_urllib3_logging)
 from homeassistant.const import (
     CONF_AUTHENTICATION, CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT,
     CONF_USERNAME, HTTP_DIGEST_AUTHENTICATION)
@@ -29,6 +29,8 @@ def _get_image_url(host, port, mode):
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Axis camera."""
+    filter_urllib3_logging()
+
     camera_config = {
         CONF_NAME: discovery_info[CONF_NAME],
         CONF_USERNAME: discovery_info[CONF_USERNAME],
diff --git a/homeassistant/components/camera/mjpeg.py b/homeassistant/components/camera/mjpeg.py
index 2819b0e6ec4..0e73dfac0b7 100644
--- a/homeassistant/components/camera/mjpeg.py
+++ b/homeassistant/components/camera/mjpeg.py
@@ -16,7 +16,7 @@ import voluptuous as vol
 
 from homeassistant.const import (
     CONF_NAME, CONF_USERNAME, CONF_PASSWORD, CONF_AUTHENTICATION,
-    HTTP_BASIC_AUTHENTICATION, HTTP_DIGEST_AUTHENTICATION)
+    HTTP_BASIC_AUTHENTICATION, HTTP_DIGEST_AUTHENTICATION, CONF_VERIFY_SSL)
 from homeassistant.components.camera import (PLATFORM_SCHEMA, Camera)
 from homeassistant.helpers.aiohttp_client import (
     async_get_clientsession, async_aiohttp_proxy_web)
@@ -29,6 +29,7 @@ CONF_STILL_IMAGE_URL = 'still_image_url'
 CONTENT_TYPE_HEADER = 'Content-Type'
 
 DEFAULT_NAME = 'Mjpeg Camera'
+DEFAULT_VERIFY_SSL = True
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_MJPEG_URL): cv.url,
@@ -38,13 +39,22 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
     vol.Optional(CONF_PASSWORD): cv.string,
     vol.Optional(CONF_USERNAME): cv.string,
+    vol.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): cv.boolean,
 })
 
 
 async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up a MJPEG IP Camera."""
-    # Filter header errors from urllib3 due to a urllib3 bug
+    filter_urllib3_logging()
+
+    if discovery_info:
+        config = PLATFORM_SCHEMA(discovery_info)
+    async_add_entities([MjpegCamera(config)])
+
+
+def filter_urllib3_logging():
+    """Filter header errors from urllib3 due to a urllib3 bug."""
     urllib3_logger = logging.getLogger("urllib3.connectionpool")
     if not any(isinstance(x, NoHeaderErrorFilter)
                for x in urllib3_logger.filters):
@@ -52,10 +62,6 @@ async def async_setup_platform(hass, config, async_add_entities,
             NoHeaderErrorFilter()
         )
 
-    if discovery_info:
-        config = PLATFORM_SCHEMA(discovery_info)
-    async_add_entities([MjpegCamera(config)])
-
 
 def extract_image_from_mjpeg(stream):
     """Take in a MJPEG stream object, return the jpg from it."""
@@ -95,6 +101,7 @@ class MjpegCamera(Camera):
                 self._auth = aiohttp.BasicAuth(
                     self._username, password=self._password
                 )
+        self._verify_ssl = device_info.get(CONF_VERIFY_SSL)
 
     async def async_camera_image(self):
         """Return a still image response from the camera."""
@@ -105,7 +112,10 @@ class MjpegCamera(Camera):
                 self.camera_image)
             return image
 
-        websession = async_get_clientsession(self.hass)
+        websession = async_get_clientsession(
+            self.hass,
+            verify_ssl=self._verify_ssl
+        )
         try:
             with async_timeout.timeout(10, loop=self.hass.loop):
                 response = await websession.get(
@@ -128,7 +138,12 @@ class MjpegCamera(Camera):
             else:
                 auth = HTTPBasicAuth(self._username, self._password)
             req = requests.get(
-                self._mjpeg_url, auth=auth, stream=True, timeout=10)
+                self._mjpeg_url,
+                auth=auth,
+                stream=True,
+                timeout=10,
+                verify=self._verify_ssl
+            )
         else:
             req = requests.get(self._mjpeg_url, stream=True, timeout=10)
 
@@ -144,7 +159,10 @@ class MjpegCamera(Camera):
             return await super().handle_async_mjpeg_stream(request)
 
         # connect to stream
-        websession = async_get_clientsession(self.hass)
+        websession = async_get_clientsession(
+            self.hass,
+            verify_ssl=self._verify_ssl
+        )
         stream_coro = websession.get(self._mjpeg_url, auth=self._auth)
 
         return await async_aiohttp_proxy_web(self.hass, request, stream_coro)
diff --git a/homeassistant/components/camera/skybell.py b/homeassistant/components/camera/skybell.py
index 9a7d7a06944..3ad95e40d62 100644
--- a/homeassistant/components/camera/skybell.py
+++ b/homeassistant/components/camera/skybell.py
@@ -8,6 +8,11 @@ from datetime import timedelta
 import logging
 
 import requests
+import voluptuous as vol
+
+from homeassistant.components.camera import PLATFORM_SCHEMA
+from homeassistant.const import CONF_MONITORED_CONDITIONS
+import homeassistant.helpers.config_validation as cv
 
 from homeassistant.components.camera import Camera
 from homeassistant.components.skybell import (
@@ -19,14 +24,33 @@ _LOGGER = logging.getLogger(__name__)
 
 SCAN_INTERVAL = timedelta(seconds=90)
 
+IMAGE_AVATAR = 'avatar'
+IMAGE_ACTIVITY = 'activity'
+
+CONF_ACTIVITY_NAME = 'activity_name'
+CONF_AVATAR_NAME = 'avatar_name'
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_MONITORED_CONDITIONS, default=[IMAGE_AVATAR]):
+        vol.All(cv.ensure_list, [vol.In([IMAGE_AVATAR, IMAGE_ACTIVITY])]),
+    vol.Optional(CONF_ACTIVITY_NAME): cv.string,
+    vol.Optional(CONF_AVATAR_NAME): cv.string,
+})
+
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the platform for a Skybell device."""
+    cond = config[CONF_MONITORED_CONDITIONS]
+    names = {}
+    names[IMAGE_ACTIVITY] = config.get(CONF_ACTIVITY_NAME)
+    names[IMAGE_AVATAR] = config.get(CONF_AVATAR_NAME)
     skybell = hass.data.get(SKYBELL_DOMAIN)
 
     sensors = []
     for device in skybell.get_devices():
-        sensors.append(SkybellCamera(device))
+        for camera_type in cond:
+            sensors.append(SkybellCamera(device, camera_type,
+                                         names.get(camera_type)))
 
     add_entities(sensors, True)
 
@@ -34,11 +58,15 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 class SkybellCamera(SkybellDevice, Camera):
     """A camera implementation for Skybell devices."""
 
-    def __init__(self, device):
+    def __init__(self, device, camera_type, name=None):
         """Initialize a camera for a Skybell device."""
+        self._type = camera_type
         SkybellDevice.__init__(self, device)
         Camera.__init__(self)
-        self._name = self._device.name
+        if name is not None:
+            self._name = "{} {}".format(self._device.name, name)
+        else:
+            self._name = self._device.name
         self._url = None
         self._response = None
 
@@ -47,12 +75,19 @@ class SkybellCamera(SkybellDevice, Camera):
         """Return the name of the sensor."""
         return self._name
 
+    @property
+    def image_url(self):
+        """Get the camera image url based on type."""
+        if self._type == IMAGE_ACTIVITY:
+            return self._device.activity_image
+        return self._device.image
+
     def camera_image(self):
         """Get the latest camera image."""
         super().update()
 
-        if self._url != self._device.image:
-            self._url = self._device.image
+        if self._url != self.image_url:
+            self._url = self.image_url
 
             try:
                 self._response = requests.get(
diff --git a/homeassistant/components/camera/yi.py b/homeassistant/components/camera/yi.py
index 22311510ede..8b5b865ee57 100644
--- a/homeassistant/components/camera/yi.py
+++ b/homeassistant/components/camera/yi.py
@@ -17,7 +17,7 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream
 from homeassistant.exceptions import PlatformNotReady
 
-REQUIREMENTS = ['aioftp==0.10.1']
+REQUIREMENTS = ['aioftp==0.12.0']
 DEPENDENCIES = ['ffmpeg']
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/camera/zoneminder.py b/homeassistant/components/camera/zoneminder.py
index 55d8d91d3ee..9bde4ac099b 100644
--- a/homeassistant/components/camera/zoneminder.py
+++ b/homeassistant/components/camera/zoneminder.py
@@ -6,9 +6,9 @@ https://home-assistant.io/components/camera.zoneminder/
 """
 import logging
 
-from homeassistant.const import CONF_NAME
+from homeassistant.const import CONF_NAME, CONF_VERIFY_SSL
 from homeassistant.components.camera.mjpeg import (
-    CONF_MJPEG_URL, CONF_STILL_IMAGE_URL, MjpegCamera)
+    CONF_MJPEG_URL, CONF_STILL_IMAGE_URL, MjpegCamera, filter_urllib3_logging)
 from homeassistant.components.zoneminder import DOMAIN as ZONEMINDER_DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
@@ -18,6 +18,7 @@ DEPENDENCIES = ['zoneminder']
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the ZoneMinder cameras."""
+    filter_urllib3_logging()
     zm_client = hass.data[ZONEMINDER_DOMAIN]
 
     monitors = zm_client.get_monitors()
@@ -28,22 +29,24 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     cameras = []
     for monitor in monitors:
         _LOGGER.info("Initializing camera %s", monitor.id)
-        cameras.append(ZoneMinderCamera(monitor))
+        cameras.append(ZoneMinderCamera(monitor, zm_client.verify_ssl))
     add_entities(cameras)
 
 
 class ZoneMinderCamera(MjpegCamera):
     """Representation of a ZoneMinder Monitor Stream."""
 
-    def __init__(self, monitor):
+    def __init__(self, monitor, verify_ssl):
         """Initialize as a subclass of MjpegCamera."""
         device_info = {
             CONF_NAME: monitor.name,
             CONF_MJPEG_URL: monitor.mjpeg_image_url,
-            CONF_STILL_IMAGE_URL: monitor.still_image_url
+            CONF_STILL_IMAGE_URL: monitor.still_image_url,
+            CONF_VERIFY_SSL: verify_ssl
         }
         super().__init__(device_info)
         self._is_recording = None
+        self._is_available = None
         self._monitor = monitor
 
     @property
@@ -55,8 +58,14 @@ class ZoneMinderCamera(MjpegCamera):
         """Update our recording state from the ZM API."""
         _LOGGER.debug("Updating camera state for monitor %i", self._monitor.id)
         self._is_recording = self._monitor.is_recording
+        self._is_available = self._monitor.is_available
 
     @property
     def is_recording(self):
         """Return whether the monitor is in alarm mode."""
         return self._is_recording
+
+    @property
+    def available(self):
+        """Return True if entity is available."""
+        return self._is_available
diff --git a/homeassistant/components/cast/.translations/ca.json b/homeassistant/components/cast/.translations/ca.json
index 570cc7fdc00..26236397dec 100644
--- a/homeassistant/components/cast/.translations/ca.json
+++ b/homeassistant/components/cast/.translations/ca.json
@@ -6,7 +6,7 @@
         },
         "step": {
             "confirm": {
-                "description": "Voleu configurar Google Cast?",
+                "description": "Vols configurar Google Cast?",
                 "title": "Google Cast"
             }
         },
diff --git a/homeassistant/components/cast/.translations/hu.json b/homeassistant/components/cast/.translations/hu.json
index f59a1b43ef1..66dc4ea8dd8 100644
--- a/homeassistant/components/cast/.translations/hu.json
+++ b/homeassistant/components/cast/.translations/hu.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "no_devices_found": "Nem tal\u00e1lhat\u00f3k Google Cast eszk\u00f6z\u00f6k a h\u00e1l\u00f3zaton."
+            "no_devices_found": "Nem tal\u00e1lhat\u00f3k Google Cast eszk\u00f6z\u00f6k a h\u00e1l\u00f3zaton.",
+            "single_instance_allowed": "Csak egyetlen Google Cast konfigur\u00e1ci\u00f3 sz\u00fcks\u00e9ges."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/climate/__init__.py b/homeassistant/components/climate/__init__.py
index 4b73e24fb41..d116a885319 100644
--- a/homeassistant/components/climate/__init__.py
+++ b/homeassistant/components/climate/__init__.py
@@ -92,15 +92,15 @@ CONVERTIBLE_ATTRIBUTE = [
 _LOGGER = logging.getLogger(__name__)
 
 ON_OFF_SERVICE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
 })
 
 SET_AWAY_MODE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Required(ATTR_AWAY_MODE): cv.boolean,
 })
 SET_AUX_HEAT_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Required(ATTR_AUX_HEAT): cv.boolean,
 })
 SET_TEMPERATURE_SCHEMA = vol.Schema(vol.All(
@@ -110,28 +110,28 @@ SET_TEMPERATURE_SCHEMA = vol.Schema(vol.All(
         vol.Exclusive(ATTR_TEMPERATURE, 'temperature'): vol.Coerce(float),
         vol.Inclusive(ATTR_TARGET_TEMP_HIGH, 'temperature'): vol.Coerce(float),
         vol.Inclusive(ATTR_TARGET_TEMP_LOW, 'temperature'): vol.Coerce(float),
-        vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+        vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
         vol.Optional(ATTR_OPERATION_MODE): cv.string,
     }
 ))
 SET_FAN_MODE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Required(ATTR_FAN_MODE): cv.string,
 })
 SET_HOLD_MODE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Required(ATTR_HOLD_MODE): cv.string,
 })
 SET_OPERATION_MODE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Required(ATTR_OPERATION_MODE): cv.string,
 })
 SET_HUMIDITY_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Required(ATTR_HUMIDITY): vol.Coerce(float),
 })
 SET_SWING_MODE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Required(ATTR_SWING_MODE): cv.string,
 })
 
diff --git a/homeassistant/components/climate/daikin.py b/homeassistant/components/climate/daikin.py
index 38c78bfdb3d..45589c12864 100644
--- a/homeassistant/components/climate/daikin.py
+++ b/homeassistant/components/climate/daikin.py
@@ -15,14 +15,13 @@ from homeassistant.components.climate import (
     STATE_FAN_ONLY, STATE_HEAT, STATE_OFF, SUPPORT_FAN_MODE,
     SUPPORT_OPERATION_MODE, SUPPORT_SWING_MODE, SUPPORT_TARGET_TEMPERATURE,
     ClimateDevice)
-from homeassistant.components.daikin import (
-    ATTR_INSIDE_TEMPERATURE, ATTR_OUTSIDE_TEMPERATURE, ATTR_TARGET_TEMPERATURE,
-    daikin_api_setup)
+from homeassistant.components.daikin import DOMAIN as DAIKIN_DOMAIN
+from homeassistant.components.daikin.const import (
+    ATTR_INSIDE_TEMPERATURE, ATTR_OUTSIDE_TEMPERATURE, ATTR_TARGET_TEMPERATURE)
 from homeassistant.const import (
     ATTR_TEMPERATURE, CONF_HOST, CONF_NAME, TEMP_CELSIUS)
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['pydaikin==0.8']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -60,18 +59,18 @@ HA_ATTR_TO_DAIKIN = {
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Daikin HVAC platform."""
-    if discovery_info is not None:
-        host = discovery_info.get('ip')
-        name = None
-        _LOGGER.debug("Discovered a Daikin AC on %s", host)
-    else:
-        host = config.get(CONF_HOST)
-        name = config.get(CONF_NAME)
-        _LOGGER.debug("Added Daikin AC on %s", host)
+    """Old way of setting up the Daikin HVAC platform.
 
-    api = daikin_api_setup(hass, host, name)
-    add_entities([DaikinClimate(api)], True)
+    Can only be called when a user accidentally mentions the platform in their
+    config. But even in that case it would have been ignored.
+    """
+    pass
+
+
+async def async_setup_entry(hass, entry, async_add_entities):
+    """Set up Daikin climate based on config_entry."""
+    daikin_api = hass.data[DAIKIN_DOMAIN].get(entry.entry_id)
+    async_add_entities([DaikinClimate(daikin_api)])
 
 
 class DaikinClimate(ClimateDevice):
@@ -266,3 +265,8 @@ class DaikinClimate(ClimateDevice):
     def update(self):
         """Retrieve latest state."""
         self._api.update()
+
+    @property
+    def device_info(self):
+        """Return a device description for device registry."""
+        return self._api.device_info
diff --git a/homeassistant/components/climate/eq3btsmart.py b/homeassistant/components/climate/eq3btsmart.py
index bb0a9d4b810..1eaaaa9d34e 100644
--- a/homeassistant/components/climate/eq3btsmart.py
+++ b/homeassistant/components/climate/eq3btsmart.py
@@ -9,7 +9,8 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.climate import (
-    STATE_ON, STATE_OFF, STATE_AUTO, PLATFORM_SCHEMA, ClimateDevice,
+    STATE_ON, STATE_OFF, STATE_HEAT, STATE_MANUAL, STATE_ECO, PLATFORM_SCHEMA,
+    ClimateDevice,
     SUPPORT_TARGET_TEMPERATURE, SUPPORT_OPERATION_MODE, SUPPORT_AWAY_MODE,
     SUPPORT_ON_OFF)
 from homeassistant.const import (
@@ -21,8 +22,6 @@ REQUIREMENTS = ['python-eq3bt==0.1.9', 'construct==2.9.45']
 _LOGGER = logging.getLogger(__name__)
 
 STATE_BOOST = 'boost'
-STATE_AWAY = 'away'
-STATE_MANUAL = 'manual'
 
 ATTR_STATE_WINDOW_OPEN = 'window_open'
 ATTR_STATE_VALVE = 'valve'
@@ -65,10 +64,10 @@ class EQ3BTSmartThermostat(ClimateDevice):
         self.modes = {
             eq3.Mode.Open: STATE_ON,
             eq3.Mode.Closed: STATE_OFF,
-            eq3.Mode.Auto: STATE_AUTO,
+            eq3.Mode.Auto: STATE_HEAT,
             eq3.Mode.Manual: STATE_MANUAL,
             eq3.Mode.Boost: STATE_BOOST,
-            eq3.Mode.Away: STATE_AWAY,
+            eq3.Mode.Away: STATE_ECO,
         }
 
         self.reverse_modes = {v: k for k, v in self.modes.items()}
@@ -140,20 +139,20 @@ class EQ3BTSmartThermostat(ClimateDevice):
 
     def turn_away_mode_off(self):
         """Away mode off turns to AUTO mode."""
-        self.set_operation_mode(STATE_AUTO)
+        self.set_operation_mode(STATE_HEAT)
 
     def turn_away_mode_on(self):
         """Set away mode on."""
-        self.set_operation_mode(STATE_AWAY)
+        self.set_operation_mode(STATE_ECO)
 
     @property
     def is_away_mode_on(self):
         """Return if we are away."""
-        return self.current_operation == STATE_AWAY
+        return self.current_operation == STATE_ECO
 
     def turn_on(self):
         """Turn device on."""
-        self.set_operation_mode(STATE_AUTO)
+        self.set_operation_mode(STATE_HEAT)
 
     def turn_off(self):
         """Turn device off."""
diff --git a/homeassistant/components/climate/homekit_controller.py b/homeassistant/components/climate/homekit_controller.py
index f720fb60277..e703bfe182d 100644
--- a/homeassistant/components/climate/homekit_controller.py
+++ b/homeassistant/components/climate/homekit_controller.py
@@ -50,23 +50,23 @@ class HomeKitClimateDevice(HomeKitEntity, ClimateDevice):
     def update_characteristics(self, characteristics):
         """Synchronise device state with Home Assistant."""
         # pylint: disable=import-error
-        from homekit import CharacteristicsTypes as ctypes
+        from homekit.models.characteristics import CharacteristicsTypes
 
         for characteristic in characteristics:
             ctype = characteristic['type']
-            if ctype == ctypes.HEATING_COOLING_CURRENT:
+            if ctype == CharacteristicsTypes.HEATING_COOLING_CURRENT:
                 self._state = MODE_HOMEKIT_TO_HASS.get(
                     characteristic['value'])
-            if ctype == ctypes.HEATING_COOLING_TARGET:
+            if ctype == CharacteristicsTypes.HEATING_COOLING_TARGET:
                 self._chars['target_mode'] = characteristic['iid']
                 self._features |= SUPPORT_OPERATION_MODE
                 self._current_mode = MODE_HOMEKIT_TO_HASS.get(
                     characteristic['value'])
                 self._valid_modes = [MODE_HOMEKIT_TO_HASS.get(
                     mode) for mode in characteristic['valid-values']]
-            elif ctype == ctypes.TEMPERATURE_CURRENT:
+            elif ctype == CharacteristicsTypes.TEMPERATURE_CURRENT:
                 self._current_temp = characteristic['value']
-            elif ctype == ctypes.TEMPERATURE_TARGET:
+            elif ctype == CharacteristicsTypes.TEMPERATURE_TARGET:
                 self._chars['target_temp'] = characteristic['iid']
                 self._features |= SUPPORT_TARGET_TEMPERATURE
                 self._target_temp = characteristic['value']
diff --git a/homeassistant/components/climate/knx.py b/homeassistant/components/climate/knx.py
index b52bd4b418d..77d995af2a1 100644
--- a/homeassistant/components/climate/knx.py
+++ b/homeassistant/components/climate/knx.py
@@ -6,14 +6,17 @@ https://home-assistant.io/components/climate.knx/
 """
 
 import voluptuous as vol
-
-from homeassistant.components.climate import (
-    PLATFORM_SCHEMA, SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE,
-    ClimateDevice)
-from homeassistant.components.knx import ATTR_DISCOVER_DEVICES, DATA_KNX
-from homeassistant.const import ATTR_TEMPERATURE, CONF_NAME, TEMP_CELSIUS
-from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
+from homeassistant.components.climate import (
+    PLATFORM_SCHEMA, SUPPORT_ON_OFF, SUPPORT_OPERATION_MODE,
+    SUPPORT_TARGET_TEMPERATURE, STATE_HEAT,
+    STATE_IDLE, STATE_MANUAL, STATE_DRY,
+    STATE_FAN_ONLY, STATE_ECO, ClimateDevice)
+from homeassistant.const import (
+    ATTR_TEMPERATURE, CONF_NAME, TEMP_CELSIUS)
+from homeassistant.core import callback
+
+from homeassistant.components.knx import DATA_KNX, ATTR_DISCOVER_DEVICES
 
 CONF_SETPOINT_SHIFT_ADDRESS = 'setpoint_shift_address'
 CONF_SETPOINT_SHIFT_STATE_ADDRESS = 'setpoint_shift_state_address'
@@ -26,10 +29,17 @@ CONF_OPERATION_MODE_ADDRESS = 'operation_mode_address'
 CONF_OPERATION_MODE_STATE_ADDRESS = 'operation_mode_state_address'
 CONF_CONTROLLER_STATUS_ADDRESS = 'controller_status_address'
 CONF_CONTROLLER_STATUS_STATE_ADDRESS = 'controller_status_state_address'
+CONF_CONTROLLER_MODE_ADDRESS = 'controller_mode_address'
+CONF_CONTROLLER_MODE_STATE_ADDRESS = 'controller_mode_state_address'
 CONF_OPERATION_MODE_FROST_PROTECTION_ADDRESS = \
     'operation_mode_frost_protection_address'
 CONF_OPERATION_MODE_NIGHT_ADDRESS = 'operation_mode_night_address'
 CONF_OPERATION_MODE_COMFORT_ADDRESS = 'operation_mode_comfort_address'
+CONF_OPERATION_MODES = 'operation_modes'
+CONF_ON_OFF_ADDRESS = 'on_off_address'
+CONF_ON_OFF_STATE_ADDRESS = 'on_off_state_address'
+CONF_MIN_TEMP = 'min_temp'
+CONF_MAX_TEMP = 'max_temp'
 
 DEFAULT_NAME = 'KNX Climate'
 DEFAULT_SETPOINT_SHIFT_STEP = 0.5
@@ -37,6 +47,21 @@ DEFAULT_SETPOINT_SHIFT_MAX = 6
 DEFAULT_SETPOINT_SHIFT_MIN = -6
 DEPENDENCIES = ['knx']
 
+# Map KNX operation modes to HA modes. This list might not be full.
+OPERATION_MODES = {
+    # Map DPT 201.100 HVAC operating modes
+    "Frost Protection": STATE_MANUAL,
+    "Night": STATE_IDLE,
+    "Standby": STATE_ECO,
+    "Comfort": STATE_HEAT,
+    # Map DPT 201.104 HVAC control modes
+    "Fan only": STATE_FAN_ONLY,
+    "Dehumidification": STATE_DRY
+}
+
+OPERATION_MODES_INV = dict((
+    reversed(item) for item in OPERATION_MODES.items()))
+
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
     vol.Required(CONF_TEMPERATURE_ADDRESS): cv.string,
@@ -54,9 +79,17 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_OPERATION_MODE_STATE_ADDRESS): cv.string,
     vol.Optional(CONF_CONTROLLER_STATUS_ADDRESS): cv.string,
     vol.Optional(CONF_CONTROLLER_STATUS_STATE_ADDRESS): cv.string,
+    vol.Optional(CONF_CONTROLLER_MODE_ADDRESS): cv.string,
+    vol.Optional(CONF_CONTROLLER_MODE_STATE_ADDRESS): cv.string,
     vol.Optional(CONF_OPERATION_MODE_FROST_PROTECTION_ADDRESS): cv.string,
     vol.Optional(CONF_OPERATION_MODE_NIGHT_ADDRESS): cv.string,
     vol.Optional(CONF_OPERATION_MODE_COMFORT_ADDRESS): cv.string,
+    vol.Optional(CONF_ON_OFF_ADDRESS): cv.string,
+    vol.Optional(CONF_ON_OFF_STATE_ADDRESS): cv.string,
+    vol.Optional(CONF_OPERATION_MODES): vol.All(cv.ensure_list,
+                                                [vol.In(OPERATION_MODES)]),
+    vol.Optional(CONF_MIN_TEMP): vol.Coerce(float),
+    vol.Optional(CONF_MAX_TEMP): vol.Coerce(float),
 })
 
 
@@ -84,6 +117,30 @@ def async_add_entities_config(hass, config, async_add_entities):
     """Set up climate for KNX platform configured within platform."""
     import xknx
 
+    climate_mode = xknx.devices.ClimateMode(
+        hass.data[DATA_KNX].xknx,
+        name=config.get(CONF_NAME) + " Mode",
+        group_address_operation_mode=config.get(CONF_OPERATION_MODE_ADDRESS),
+        group_address_operation_mode_state=config.get(
+            CONF_OPERATION_MODE_STATE_ADDRESS),
+        group_address_controller_status=config.get(
+            CONF_CONTROLLER_STATUS_ADDRESS),
+        group_address_controller_status_state=config.get(
+            CONF_CONTROLLER_STATUS_STATE_ADDRESS),
+        group_address_controller_mode=config.get(
+            CONF_CONTROLLER_MODE_ADDRESS),
+        group_address_controller_mode_state=config.get(
+            CONF_CONTROLLER_MODE_STATE_ADDRESS),
+        group_address_operation_mode_protection=config.get(
+            CONF_OPERATION_MODE_FROST_PROTECTION_ADDRESS),
+        group_address_operation_mode_night=config.get(
+            CONF_OPERATION_MODE_NIGHT_ADDRESS),
+        group_address_operation_mode_comfort=config.get(
+            CONF_OPERATION_MODE_COMFORT_ADDRESS),
+        operation_modes=config.get(
+            CONF_OPERATION_MODES))
+    hass.data[DATA_KNX].xknx.devices.add(climate_mode)
+
     climate = xknx.devices.Climate(
         hass.data[DATA_KNX].xknx,
         name=config.get(CONF_NAME),
@@ -96,20 +153,15 @@ def async_add_entities_config(hass, config, async_add_entities):
         setpoint_shift_step=config.get(CONF_SETPOINT_SHIFT_STEP),
         setpoint_shift_max=config.get(CONF_SETPOINT_SHIFT_MAX),
         setpoint_shift_min=config.get(CONF_SETPOINT_SHIFT_MIN),
-        group_address_operation_mode=config.get(CONF_OPERATION_MODE_ADDRESS),
-        group_address_operation_mode_state=config.get(
-            CONF_OPERATION_MODE_STATE_ADDRESS),
-        group_address_controller_status=config.get(
-            CONF_CONTROLLER_STATUS_ADDRESS),
-        group_address_controller_status_state=config.get(
-            CONF_CONTROLLER_STATUS_STATE_ADDRESS),
-        group_address_operation_mode_protection=config.get(
-            CONF_OPERATION_MODE_FROST_PROTECTION_ADDRESS),
-        group_address_operation_mode_night=config.get(
-            CONF_OPERATION_MODE_NIGHT_ADDRESS),
-        group_address_operation_mode_comfort=config.get(
-            CONF_OPERATION_MODE_COMFORT_ADDRESS))
+        group_address_on_off=config.get(
+            CONF_ON_OFF_ADDRESS),
+        group_address_on_off_state=config.get(
+            CONF_ON_OFF_STATE_ADDRESS),
+        min_temp=config.get(CONF_MIN_TEMP),
+        max_temp=config.get(CONF_MAX_TEMP),
+        mode=climate_mode)
     hass.data[DATA_KNX].xknx.devices.add(climate)
+
     async_add_entities([KNXClimate(climate)])
 
 
@@ -119,26 +171,25 @@ class KNXClimate(ClimateDevice):
     def __init__(self, device):
         """Initialize of a KNX climate device."""
         self.device = device
+        self._unit_of_measurement = TEMP_CELSIUS
 
     @property
     def supported_features(self):
         """Return the list of supported features."""
         support = SUPPORT_TARGET_TEMPERATURE
-        if self.device.supports_operation_mode:
+        if self.device.mode.supports_operation_mode:
             support |= SUPPORT_OPERATION_MODE
+        if self.device.supports_on_off:
+            support |= SUPPORT_ON_OFF
         return support
 
-    def async_register_callbacks(self):
+    async def async_added_to_hass(self):
         """Register callbacks to update hass after device was changed."""
         async def after_update_callback(device):
             """Call after device was updated."""
             await self.async_update_ha_state()
         self.device.register_device_updated_cb(after_update_callback)
 
-    async def async_added_to_hass(self):
-        """Store register state change callback."""
-        self.async_register_callbacks()
-
     @property
     def name(self):
         """Return the name of the KNX device."""
@@ -157,7 +208,7 @@ class KNXClimate(ClimateDevice):
     @property
     def temperature_unit(self):
         """Return the unit of measurement."""
-        return TEMP_CELSIUS
+        return self._unit_of_measurement
 
     @property
     def current_temperature(self):
@@ -195,20 +246,37 @@ class KNXClimate(ClimateDevice):
     @property
     def current_operation(self):
         """Return current operation ie. heat, cool, idle."""
-        if self.device.supports_operation_mode:
-            return self.device.operation_mode.value
+        if self.device.mode.supports_operation_mode:
+            return OPERATION_MODES.get(self.device.mode.operation_mode.value)
         return None
 
     @property
     def operation_list(self):
         """Return the list of available operation modes."""
-        return [operation_mode.value for
+        return [OPERATION_MODES.get(operation_mode.value) for
                 operation_mode in
-                self.device.get_supported_operation_modes()]
+                self.device.mode.operation_modes]
 
     async def async_set_operation_mode(self, operation_mode):
         """Set operation mode."""
-        if self.device.supports_operation_mode:
+        if self.device.mode.supports_operation_mode:
             from xknx.knx import HVACOperationMode
-            knx_operation_mode = HVACOperationMode(operation_mode)
-            await self.device.set_operation_mode(knx_operation_mode)
+            knx_operation_mode = HVACOperationMode(
+                OPERATION_MODES_INV.get(operation_mode))
+            await self.device.mode.set_operation_mode(knx_operation_mode)
+            await self.async_update_ha_state()
+
+    @property
+    def is_on(self):
+        """Return true if the device is on."""
+        if self.device.supports_on_off:
+            return self.device.is_on
+        return None
+
+    async def async_turn_on(self):
+        """Turn on."""
+        await self.device.turn_on()
+
+    async def async_turn_off(self):
+        """Turn off."""
+        await self.device.turn_off()
diff --git a/homeassistant/components/climate/mill.py b/homeassistant/components/climate/mill.py
index 5ea48614f6b..afd655bed22 100644
--- a/homeassistant/components/climate/mill.py
+++ b/homeassistant/components/climate/mill.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-REQUIREMENTS = ['millheater==0.2.9']
+REQUIREMENTS = ['millheater==0.3.3']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/climate/mqtt.py b/homeassistant/components/climate/mqtt.py
index 098ff2867da..96de0709dc8 100644
--- a/homeassistant/components/climate/mqtt.py
+++ b/homeassistant/components/climate/mqtt.py
@@ -18,12 +18,13 @@ from homeassistant.components.climate import (
     SUPPORT_SWING_MODE, SUPPORT_FAN_MODE, SUPPORT_AWAY_MODE, SUPPORT_HOLD_MODE,
     SUPPORT_AUX_HEAT, DEFAULT_MIN_TEMP, DEFAULT_MAX_TEMP)
 from homeassistant.const import (
-    STATE_ON, STATE_OFF, ATTR_TEMPERATURE, CONF_NAME, CONF_VALUE_TEMPLATE)
+    ATTR_TEMPERATURE, CONF_DEVICE, CONF_NAME, CONF_VALUE_TEMPLATE, STATE_ON,
+    STATE_OFF)
 from homeassistant.components.mqtt import (
     ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_QOS, CONF_RETAIN,
     CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE,
     MQTT_BASE_PLATFORM_SCHEMA, MqttAvailability, MqttDiscoveryUpdate,
-    subscription)
+    MqttEntityDeviceInfo, subscription)
 from homeassistant.components.mqtt.discovery import MQTT_DISCOVERY_NEW
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -78,6 +79,8 @@ CONF_MIN_TEMP = 'min_temp'
 CONF_MAX_TEMP = 'max_temp'
 CONF_TEMP_STEP = 'temp_step'
 
+CONF_UNIQUE_ID = 'unique_id'
+
 TEMPLATE_KEYS = (
     CONF_POWER_STATE_TEMPLATE,
     CONF_MODE_STATE_TEMPLATE,
@@ -139,8 +142,9 @@ PLATFORM_SCHEMA = SCHEMA_BASE.extend({
 
     vol.Optional(CONF_MIN_TEMP, default=DEFAULT_MIN_TEMP): vol.Coerce(float),
     vol.Optional(CONF_MAX_TEMP, default=DEFAULT_MAX_TEMP): vol.Coerce(float),
-    vol.Optional(CONF_TEMP_STEP, default=1.0): vol.Coerce(float)
-
+    vol.Optional(CONF_TEMP_STEP, default=1.0): vol.Coerce(float),
+    vol.Optional(CONF_UNIQUE_ID): cv.string,
+    vol.Optional(CONF_DEVICE): mqtt.MQTT_ENTITY_DEVICE_INFO_SCHEMA,
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
@@ -174,12 +178,14 @@ async def _async_setup_entity(hass, config, async_add_entities,
         )])
 
 
-class MqttClimate(MqttAvailability, MqttDiscoveryUpdate, ClimateDevice):
+class MqttClimate(MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo,
+                  ClimateDevice):
     """Representation of an MQTT climate device."""
 
     def __init__(self, hass, config, discovery_hash):
         """Initialize the climate device."""
         self._config = config
+        self._unique_id = config.get(CONF_UNIQUE_ID)
         self._sub_state = None
 
         self.hass = hass
@@ -201,11 +207,13 @@ class MqttClimate(MqttAvailability, MqttDiscoveryUpdate, ClimateDevice):
         payload_available = config.get(CONF_PAYLOAD_AVAILABLE)
         payload_not_available = config.get(CONF_PAYLOAD_NOT_AVAILABLE)
         qos = config.get(CONF_QOS)
+        device_config = config.get(CONF_DEVICE)
 
         MqttAvailability.__init__(self, availability_topic, qos,
                                   payload_available, payload_not_available)
         MqttDiscoveryUpdate.__init__(self, discovery_hash,
                                      self.discovery_update)
+        MqttEntityDeviceInfo.__init__(self, device_config)
 
     async def async_added_to_hass(self):
         """Handle being added to home assistant."""
@@ -453,7 +461,8 @@ class MqttClimate(MqttAvailability, MqttDiscoveryUpdate, ClimateDevice):
 
     async def async_will_remove_from_hass(self):
         """Unsubscribe when removed."""
-        await subscription.async_unsubscribe_topics(self.hass, self._sub_state)
+        self._sub_state = await subscription.async_unsubscribe_topics(
+            self.hass, self._sub_state)
         await MqttAvailability.async_will_remove_from_hass(self)
 
     @property
@@ -466,6 +475,11 @@ class MqttClimate(MqttAvailability, MqttDiscoveryUpdate, ClimateDevice):
         """Return the name of the climate device."""
         return self._config.get(CONF_NAME)
 
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._unique_id
+
     @property
     def temperature_unit(self):
         """Return the unit of measurement."""
diff --git a/homeassistant/components/climate/radiotherm.py b/homeassistant/components/climate/radiotherm.py
index f914b9b4762..f0423d32c96 100644
--- a/homeassistant/components/climate/radiotherm.py
+++ b/homeassistant/components/climate/radiotherm.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
     CONF_HOST, TEMP_FAHRENHEIT, ATTR_TEMPERATURE, PRECISION_HALVES)
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['radiotherm==1.4.1']
+REQUIREMENTS = ['radiotherm==2.0.0']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -235,13 +235,15 @@ class RadioThermostat(ClimateDevice):
             self._name = self.device.name['raw']
 
         # Request the current state from the thermostat.
-        data = self.device.tstat['raw']
+        import radiotherm
+        try:
+            data = self.device.tstat['raw']
+        except radiotherm.validate.RadiothermTstatError:
+            _LOGGER.error('%s (%s) was busy (invalid value returned)',
+                          self._name, self.device.host)
+            return
 
         current_temp = data['temp']
-        if current_temp == -1:
-            _LOGGER.error('%s (%s) was busy (temp == -1)', self._name,
-                          self.device.host)
-            return
 
         # Map thermostat values into various STATE_ flags.
         self._current_temperature = current_temp
diff --git a/homeassistant/components/cloud/__init__.py b/homeassistant/components/cloud/__init__.py
index fd5b413043e..d938dd20e67 100644
--- a/homeassistant/components/cloud/__init__.py
+++ b/homeassistant/components/cloud/__init__.py
@@ -99,6 +99,8 @@ async def async_setup(hass, config):
         kwargs[CONF_GOOGLE_ACTIONS] = GACTIONS_SCHEMA({})
 
     kwargs[CONF_ALEXA] = alexa_sh.Config(
+        endpoint=None,
+        async_get_access_token=None,
         should_expose=alexa_conf[CONF_FILTER],
         entity_config=alexa_conf.get(CONF_ENTITY_CONFIG),
     )
diff --git a/homeassistant/components/config/auth.py b/homeassistant/components/config/auth.py
index ec83918e9f0..625dbefbbb3 100644
--- a/homeassistant/components/config/auth.py
+++ b/homeassistant/components/config/auth.py
@@ -39,7 +39,7 @@ async def async_setup(hass):
     return True
 
 
-@websocket_api.require_owner
+@websocket_api.require_admin
 @websocket_api.async_response
 async def websocket_list(hass, connection, msg):
     """Return a list of users."""
@@ -49,7 +49,7 @@ async def websocket_list(hass, connection, msg):
         websocket_api.result_message(msg['id'], result))
 
 
-@websocket_api.require_owner
+@websocket_api.require_admin
 @websocket_api.async_response
 async def websocket_delete(hass, connection, msg):
     """Delete a user."""
@@ -72,7 +72,7 @@ async def websocket_delete(hass, connection, msg):
         websocket_api.result_message(msg['id']))
 
 
-@websocket_api.require_owner
+@websocket_api.require_admin
 @websocket_api.async_response
 async def websocket_create(hass, connection, msg):
     """Create a user."""
diff --git a/homeassistant/components/config/auth_provider_homeassistant.py b/homeassistant/components/config/auth_provider_homeassistant.py
index 3495a959f49..5455277aa78 100644
--- a/homeassistant/components/config/auth_provider_homeassistant.py
+++ b/homeassistant/components/config/auth_provider_homeassistant.py
@@ -3,7 +3,6 @@ import voluptuous as vol
 
 from homeassistant.auth.providers import homeassistant as auth_ha
 from homeassistant.components import websocket_api
-from homeassistant.components.websocket_api.decorators import require_owner
 
 
 WS_TYPE_CREATE = 'config/auth_provider/homeassistant/create'
@@ -54,7 +53,7 @@ def _get_provider(hass):
     raise RuntimeError('Provider not found')
 
 
-@require_owner
+@websocket_api.require_admin
 @websocket_api.async_response
 async def websocket_create(hass, connection, msg):
     """Create credentials and attach to a user."""
@@ -91,7 +90,7 @@ async def websocket_create(hass, connection, msg):
     connection.send_message(websocket_api.result_message(msg['id']))
 
 
-@require_owner
+@websocket_api.require_admin
 @websocket_api.async_response
 async def websocket_delete(hass, connection, msg):
     """Delete username and related credential."""
@@ -123,6 +122,7 @@ async def websocket_delete(hass, connection, msg):
         websocket_api.result_message(msg['id']))
 
 
+@websocket_api.require_admin
 @websocket_api.async_response
 async def websocket_change_password(hass, connection, msg):
     """Change user password."""
diff --git a/homeassistant/components/config/config_entries.py b/homeassistant/components/config/config_entries.py
index 644990d7185..68890a79ca6 100644
--- a/homeassistant/components/config/config_entries.py
+++ b/homeassistant/components/config/config_entries.py
@@ -1,7 +1,9 @@
 """Http views to control the config manager."""
 
 from homeassistant import config_entries, data_entry_flow
+from homeassistant.auth.permissions.const import CAT_CONFIG_ENTRIES
 from homeassistant.components.http import HomeAssistantView
+from homeassistant.exceptions import Unauthorized
 from homeassistant.helpers.data_entry_flow import (
     FlowManagerIndexView, FlowManagerResourceView)
 
@@ -63,6 +65,9 @@ class ConfigManagerEntryResourceView(HomeAssistantView):
 
     async def delete(self, request, entry_id):
         """Delete a config entry."""
+        if not request['hass_user'].is_admin:
+            raise Unauthorized(config_entry_id=entry_id, permission='remove')
+
         hass = request.app['hass']
 
         try:
@@ -85,12 +90,26 @@ class ConfigManagerFlowIndexView(FlowManagerIndexView):
         Example of a non-user initiated flow is a discovered Hue hub that
         requires user interaction to finish setup.
         """
+        if not request['hass_user'].is_admin:
+            raise Unauthorized(
+                perm_category=CAT_CONFIG_ENTRIES, permission='add')
+
         hass = request.app['hass']
 
         return self.json([
             flw for flw in hass.config_entries.flow.async_progress()
             if flw['context']['source'] != config_entries.SOURCE_USER])
 
+    # pylint: disable=arguments-differ
+    async def post(self, request):
+        """Handle a POST request."""
+        if not request['hass_user'].is_admin:
+            raise Unauthorized(
+                perm_category=CAT_CONFIG_ENTRIES, permission='add')
+
+        # pylint: disable=no-value-for-parameter
+        return await super().post(request)
+
 
 class ConfigManagerFlowResourceView(FlowManagerResourceView):
     """View to interact with the flow manager."""
@@ -98,6 +117,24 @@ class ConfigManagerFlowResourceView(FlowManagerResourceView):
     url = '/api/config/config_entries/flow/{flow_id}'
     name = 'api:config:config_entries:flow:resource'
 
+    async def get(self, request, flow_id):
+        """Get the current state of a data_entry_flow."""
+        if not request['hass_user'].is_admin:
+            raise Unauthorized(
+                perm_category=CAT_CONFIG_ENTRIES, permission='add')
+
+        return await super().get(request, flow_id)
+
+    # pylint: disable=arguments-differ
+    async def post(self, request, flow_id):
+        """Handle a POST request."""
+        if not request['hass_user'].is_admin:
+            raise Unauthorized(
+                perm_category=CAT_CONFIG_ENTRIES, permission='add')
+
+        # pylint: disable=no-value-for-parameter
+        return await super().post(request, flow_id)
+
 
 class ConfigManagerAvailableFlowView(HomeAssistantView):
     """View to query available flows."""
diff --git a/homeassistant/components/counter/__init__.py b/homeassistant/components/counter/__init__.py
index 228870489a2..cd3a29df2b6 100644
--- a/homeassistant/components/counter/__init__.py
+++ b/homeassistant/components/counter/__init__.py
@@ -33,7 +33,7 @@ SERVICE_INCREMENT = 'increment'
 SERVICE_RESET = 'reset'
 
 SERVICE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
 })
 
 CONFIG_SCHEMA = vol.Schema({
diff --git a/homeassistant/components/cover/__init__.py b/homeassistant/components/cover/__init__.py
index ec11b139f6b..ef8fcc42302 100644
--- a/homeassistant/components/cover/__init__.py
+++ b/homeassistant/components/cover/__init__.py
@@ -60,7 +60,7 @@ INTENT_OPEN_COVER = 'HassOpenCover'
 INTENT_CLOSE_COVER = 'HassCloseCover'
 
 COVER_SERVICE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
 })
 
 COVER_SET_COVER_POSITION_SCHEMA = COVER_SERVICE_SCHEMA.extend({
diff --git a/homeassistant/components/cover/esphome.py b/homeassistant/components/cover/esphome.py
new file mode 100644
index 00000000000..97f082f8be5
--- /dev/null
+++ b/homeassistant/components/cover/esphome.py
@@ -0,0 +1,89 @@
+"""Support for ESPHome covers."""
+import logging
+
+from typing import TYPE_CHECKING, Optional
+
+from homeassistant.components.cover import CoverDevice, SUPPORT_CLOSE, \
+    SUPPORT_OPEN, SUPPORT_STOP
+from homeassistant.components.esphome import EsphomeEntity, \
+    platform_async_setup_entry
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import STATE_CLOSED, STATE_OPEN
+from homeassistant.helpers.typing import HomeAssistantType
+
+if TYPE_CHECKING:
+    # pylint: disable=unused-import
+    from aioesphomeapi import CoverInfo, CoverState  # noqa
+
+DEPENDENCIES = ['esphome']
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(hass: HomeAssistantType,
+                            entry: ConfigEntry, async_add_entities) -> None:
+    """Set up ESPHome covers based on a config entry."""
+    # pylint: disable=redefined-outer-name
+    from aioesphomeapi import CoverInfo, CoverState  # noqa
+
+    await platform_async_setup_entry(
+        hass, entry, async_add_entities,
+        component_key='cover',
+        info_type=CoverInfo, entity_type=EsphomeCover,
+        state_type=CoverState
+    )
+
+
+COVER_STATE_INT_TO_STR = {
+    0: STATE_OPEN,
+    1: STATE_CLOSED
+}
+
+
+class EsphomeCover(EsphomeEntity, CoverDevice):
+    """A cover implementation for ESPHome."""
+
+    @property
+    def _static_info(self) -> 'CoverInfo':
+        return super()._static_info
+
+    @property
+    def _state(self) -> Optional['CoverState']:
+        return super()._state
+
+    @property
+    def supported_features(self) -> int:
+        """Flag supported features."""
+        return SUPPORT_OPEN | SUPPORT_CLOSE | SUPPORT_STOP
+
+    @property
+    def assumed_state(self) -> bool:
+        """Return true if we do optimistic updates."""
+        return self._static_info.is_optimistic
+
+    @property
+    def is_closed(self) -> Optional[bool]:
+        """Return if the cover is closed or not."""
+        if self._state is None:
+            return None
+        return COVER_STATE_INT_TO_STR[self._state.state]
+
+    async def async_open_cover(self, **kwargs) -> None:
+        """Open the cover."""
+        from aioesphomeapi.client import COVER_COMMAND_OPEN
+
+        await self._client.cover_command(key=self._static_info.key,
+                                         command=COVER_COMMAND_OPEN)
+
+    async def async_close_cover(self, **kwargs) -> None:
+        """Close cover."""
+        from aioesphomeapi.client import COVER_COMMAND_CLOSE
+
+        await self._client.cover_command(key=self._static_info.key,
+                                         command=COVER_COMMAND_CLOSE)
+
+    async def async_stop_cover(self, **kwargs):
+        """Stop the cover."""
+        from aioesphomeapi.client import COVER_COMMAND_STOP
+
+        await self._client.cover_command(key=self._static_info.key,
+                                         command=COVER_COMMAND_STOP)
diff --git a/homeassistant/components/cover/mqtt.py b/homeassistant/components/cover/mqtt.py
index 55df204f275..3926c84cb92 100644
--- a/homeassistant/components/cover/mqtt.py
+++ b/homeassistant/components/cover/mqtt.py
@@ -287,7 +287,8 @@ class MqttCover(MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo,
 
     async def async_will_remove_from_hass(self):
         """Unsubscribe when removed."""
-        await subscription.async_unsubscribe_topics(self.hass, self._sub_state)
+        self._sub_state = await subscription.async_unsubscribe_topics(
+            self.hass, self._sub_state)
         await MqttAvailability.async_will_remove_from_hass(self)
 
     @property
diff --git a/homeassistant/components/cover/rflink.py b/homeassistant/components/cover/rflink.py
index 353cccc7d4f..cdc7cac3adb 100644
--- a/homeassistant/components/cover/rflink.py
+++ b/homeassistant/components/cover/rflink.py
@@ -15,8 +15,8 @@ from homeassistant.components.rflink import (
 from homeassistant.components.cover import (
     CoverDevice, PLATFORM_SCHEMA)
 import homeassistant.helpers.config_validation as cv
-from homeassistant.const import CONF_NAME
-
+from homeassistant.helpers.restore_state import RestoreEntity
+from homeassistant.const import CONF_NAME, STATE_OPEN
 
 DEPENDENCIES = ['rflink']
 
@@ -60,9 +60,17 @@ async def async_setup_platform(hass, config, async_add_entities,
     async_add_entities(devices_from_config(config))
 
 
-class RflinkCover(RflinkCommand, CoverDevice):
+class RflinkCover(RflinkCommand, CoverDevice, RestoreEntity):
     """Rflink entity which can switch on/stop/off (eg: cover)."""
 
+    async def async_added_to_hass(self):
+        """Restore RFLink cover state (OPEN/CLOSE)."""
+        await super().async_added_to_hass()
+
+        old_state = await self.async_get_last_state()
+        if old_state is not None:
+            self._state = old_state.state == STATE_OPEN
+
     def _handle_event(self, event):
         """Adjust state if Rflink picks up a remote command for this device."""
         self.cancel_queued_send_commands()
diff --git a/homeassistant/components/cover/tellduslive.py b/homeassistant/components/cover/tellduslive.py
index 67affdae04e..1879c88c83c 100644
--- a/homeassistant/components/cover/tellduslive.py
+++ b/homeassistant/components/cover/tellduslive.py
@@ -8,20 +8,36 @@ https://home-assistant.io/components/cover.tellduslive/
 """
 import logging
 
-from homeassistant.components import tellduslive
+from homeassistant.components import cover, tellduslive
 from homeassistant.components.cover import CoverDevice
 from homeassistant.components.tellduslive.entry import TelldusLiveEntity
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 _LOGGER = logging.getLogger(__name__)
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Telldus Live covers."""
-    if discovery_info is None:
-        return
+    """Old way of setting up TelldusLive.
 
-    client = hass.data[tellduslive.DOMAIN]
-    add_entities(TelldusLiveCover(client, cover) for cover in discovery_info)
+    Can only be called when a user accidentally mentions the platform in their
+    config. But even in that case it would have been ignored.
+    """
+    pass
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up tellduslive sensors dynamically."""
+    async def async_discover_cover(device_id):
+        """Discover and add a discovered sensor."""
+        client = hass.data[tellduslive.DOMAIN]
+        async_add_entities([TelldusLiveCover(client, device_id)])
+
+    async_dispatcher_connect(
+        hass,
+        tellduslive.TELLDUS_DISCOVERY_NEW.format(cover.DOMAIN,
+                                                 tellduslive.DOMAIN),
+        async_discover_cover,
+    )
 
 
 class TelldusLiveCover(TelldusLiveEntity, CoverDevice):
diff --git a/homeassistant/components/cover/xiaomi_aqara.py b/homeassistant/components/cover/xiaomi_aqara.py
index 3ed0a70b1e0..ead2c0e9219 100644
--- a/homeassistant/components/cover/xiaomi_aqara.py
+++ b/homeassistant/components/cover/xiaomi_aqara.py
@@ -18,9 +18,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
             model = device['model']
             if model == 'curtain':
                 devices.append(XiaomiGenericCover(device, "Curtain",
-                                                  {'status': 'status',
-                                                   'pos': 'curtain_level'},
-                                                  gateway))
+                                                  'status', gateway))
     add_entities(devices)
 
 
@@ -45,20 +43,20 @@ class XiaomiGenericCover(XiaomiDevice, CoverDevice):
 
     def close_cover(self, **kwargs):
         """Close the cover."""
-        self._write_to_hub(self._sid, **{self._data_key['status']: 'close'})
+        self._write_to_hub(self._sid, **{self._data_key: 'close'})
 
     def open_cover(self, **kwargs):
         """Open the cover."""
-        self._write_to_hub(self._sid, **{self._data_key['status']: 'open'})
+        self._write_to_hub(self._sid, **{self._data_key: 'open'})
 
     def stop_cover(self, **kwargs):
         """Stop the cover."""
-        self._write_to_hub(self._sid, **{self._data_key['status']: 'stop'})
+        self._write_to_hub(self._sid, **{self._data_key: 'stop'})
 
     def set_cover_position(self, **kwargs):
         """Move the cover to a specific position."""
         position = kwargs.get(ATTR_POSITION)
-        self._write_to_hub(self._sid, **{self._data_key['pos']: str(position)})
+        self._write_to_hub(self._sid, **{ATTR_CURTAIN_LEVEL: str(position)})
 
     def parse_data(self, data, raw_data):
         """Parse data sent by gateway."""
diff --git a/homeassistant/components/daikin.py b/homeassistant/components/daikin.py
deleted file mode 100644
index e2e4572939d..00000000000
--- a/homeassistant/components/daikin.py
+++ /dev/null
@@ -1,139 +0,0 @@
-"""
-Platform for the Daikin AC.
-
-For more details about this component, please refer to the documentation
-https://home-assistant.io/components/daikin/
-"""
-import logging
-from datetime import timedelta
-from socket import timeout
-
-import voluptuous as vol
-
-import homeassistant.helpers.config_validation as cv
-from homeassistant.components.discovery import SERVICE_DAIKIN
-from homeassistant.const import (
-    CONF_HOSTS, CONF_ICON, CONF_MONITORED_CONDITIONS, CONF_NAME, CONF_TYPE
-)
-from homeassistant.helpers import discovery
-from homeassistant.helpers.discovery import load_platform
-from homeassistant.util import Throttle
-
-REQUIREMENTS = ['pydaikin==0.8']
-
-_LOGGER = logging.getLogger(__name__)
-
-DOMAIN = 'daikin'
-
-ATTR_TARGET_TEMPERATURE = 'target_temperature'
-ATTR_INSIDE_TEMPERATURE = 'inside_temperature'
-ATTR_OUTSIDE_TEMPERATURE = 'outside_temperature'
-
-MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60)
-
-COMPONENT_TYPES = ['climate', 'sensor']
-
-SENSOR_TYPE_TEMPERATURE = 'temperature'
-
-SENSOR_TYPES = {
-    ATTR_INSIDE_TEMPERATURE: {
-        CONF_NAME: 'Inside Temperature',
-        CONF_ICON: 'mdi:thermometer',
-        CONF_TYPE: SENSOR_TYPE_TEMPERATURE
-    },
-    ATTR_OUTSIDE_TEMPERATURE: {
-        CONF_NAME: 'Outside Temperature',
-        CONF_ICON: 'mdi:thermometer',
-        CONF_TYPE: SENSOR_TYPE_TEMPERATURE
-    }
-
-}
-
-CONFIG_SCHEMA = vol.Schema({
-    DOMAIN: vol.Schema({
-        vol.Optional(
-            CONF_HOSTS, default=[]
-        ): vol.All(cv.ensure_list, [cv.string]),
-        vol.Optional(
-            CONF_MONITORED_CONDITIONS,
-            default=list(SENSOR_TYPES.keys())
-        ): vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)])
-    })
-}, extra=vol.ALLOW_EXTRA)
-
-
-def setup(hass, config):
-    """Establish connection with Daikin."""
-    def discovery_dispatch(service, discovery_info):
-        """Dispatcher for Daikin discovery events."""
-        host = discovery_info.get('ip')
-
-        if daikin_api_setup(hass, host) is None:
-            return
-
-        for component in COMPONENT_TYPES:
-            load_platform(hass, component, DOMAIN, discovery_info,
-                          config)
-
-    discovery.listen(hass, SERVICE_DAIKIN, discovery_dispatch)
-
-    for host in config.get(DOMAIN, {}).get(CONF_HOSTS, []):
-        if daikin_api_setup(hass, host) is None:
-            continue
-
-        discovery_info = {
-            'ip': host,
-            CONF_MONITORED_CONDITIONS:
-                config[DOMAIN][CONF_MONITORED_CONDITIONS]
-        }
-        load_platform(hass, 'sensor', DOMAIN, discovery_info, config)
-
-    return True
-
-
-def daikin_api_setup(hass, host, name=None):
-    """Create a Daikin instance only once."""
-    if DOMAIN not in hass.data:
-        hass.data[DOMAIN] = {}
-
-    api = hass.data[DOMAIN].get(host)
-    if api is None:
-        from pydaikin import appliance
-
-        try:
-            device = appliance.Appliance(host)
-        except timeout:
-            _LOGGER.error("Connection to Daikin could not be established")
-            return False
-
-        if name is None:
-            name = device.values['name']
-
-        api = DaikinApi(device, name)
-
-    return api
-
-
-class DaikinApi:
-    """Keep the Daikin instance in one place and centralize the update."""
-
-    def __init__(self, device, name):
-        """Initialize the Daikin Handle."""
-        self.device = device
-        self.name = name
-        self.ip_address = device.ip
-
-    @Throttle(MIN_TIME_BETWEEN_UPDATES)
-    def update(self, **kwargs):
-        """Pull the latest data from Daikin."""
-        try:
-            self.device.update_status()
-        except timeout:
-            _LOGGER.warning(
-                "Connection failed for %s", self.ip_address
-            )
-
-    @property
-    def mac(self):
-        """Return mac-address of device."""
-        return self.device.values.get('mac')
diff --git a/homeassistant/components/daikin/.translations/ca.json b/homeassistant/components/daikin/.translations/ca.json
new file mode 100644
index 00000000000..2fa60015ca3
--- /dev/null
+++ b/homeassistant/components/daikin/.translations/ca.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "El dispositiu ja est\u00e0 configurat",
+            "device_fail": "S'ha produ\u00eft un error inesperat al crear el dispositiu.",
+            "device_timeout": "S'ha acabat el temps d'espera en la connexi\u00f3 amb el dispositiu."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Amfitri\u00f3"
+                },
+                "description": "Introdueix l'adre\u00e7a IP del teu Daikin AC.",
+                "title": "Configuraci\u00f3 de Daikin AC"
+            }
+        },
+        "title": "Daikin AC"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/daikin/.translations/en.json b/homeassistant/components/daikin/.translations/en.json
new file mode 100644
index 00000000000..1605e1dc8f6
--- /dev/null
+++ b/homeassistant/components/daikin/.translations/en.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Device is already configured",
+            "device_fail": "Unexpected error creating device.",
+            "device_timeout": "Timeout connecting to the device."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Host"
+                },
+                "description": "Enter IP address of your Daikin AC.",
+                "title": "Configure Daikin AC"
+            }
+        },
+        "title": "Daikin AC"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/daikin/.translations/ko.json b/homeassistant/components/daikin/.translations/ko.json
new file mode 100644
index 00000000000..a203affdbb8
--- /dev/null
+++ b/homeassistant/components/daikin/.translations/ko.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\uc7a5\uce58\uac00 \uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4",
+            "device_fail": "\uc7a5\uce58\ub97c \uad6c\uc131\ud558\ub294\uc911 \uc608\uc0c1\uce58 \ubabb\ud55c \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.",
+            "device_timeout": "\uc7a5\uce58 \uc5f0\uacb0 \uc2dc\uac04\uc774 \ucd08\uacfc\ud588\uc2b5\ub2c8\ub2e4."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "\ud638\uc2a4\ud2b8"
+                },
+                "description": "Daikin AC \uc758 IP \uc8fc\uc18c\ub97c \uc785\ub825\ud574\uc8fc\uc138\uc694.",
+                "title": "Daikin AC \uad6c\uc131"
+            }
+        },
+        "title": "Daikin AC"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/daikin/.translations/lb.json b/homeassistant/components/daikin/.translations/lb.json
new file mode 100644
index 00000000000..cdf98f5e597
--- /dev/null
+++ b/homeassistant/components/daikin/.translations/lb.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Apparat ass scho konfigur\u00e9iert",
+            "device_fail": "Onerwaarte Feeler beim erstelle vum Apparat.",
+            "device_timeout": "Z\u00e4it Iwwerschreidung beim verbannen mam Apparat."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Apparat"
+                },
+                "description": "Gitt d'IP Adresse vum Daikin AC an:",
+                "title": "Daikin AC konfigur\u00e9ieren"
+            }
+        },
+        "title": "Daikin AC"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/daikin/.translations/ru.json b/homeassistant/components/daikin/.translations/ru.json
new file mode 100644
index 00000000000..83c42f4280c
--- /dev/null
+++ b/homeassistant/components/daikin/.translations/ru.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "device_fail": "\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0438 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430.",
+            "device_timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u043a \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0443."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "\u0425\u043e\u0441\u0442"
+                },
+                "description": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 IP-\u0430\u0434\u0440\u0435\u0441 \u0432\u0430\u0448\u0435\u0433\u043e Daikin AC.",
+                "title": "Daikin AC"
+            }
+        },
+        "title": "Daikin AC"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/daikin/.translations/sl.json b/homeassistant/components/daikin/.translations/sl.json
new file mode 100644
index 00000000000..088b354fbb1
--- /dev/null
+++ b/homeassistant/components/daikin/.translations/sl.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Naprava je \u017ee konfigurirana",
+            "device_fail": "Nepri\u010dakovana napaka pri ustvarjanju naprave.",
+            "device_timeout": "\u010casovna omejitev za priklop na napravo je potekla."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Gostitelj"
+                },
+                "description": "Vnesite naslov IP va\u0161e Daikin klime.",
+                "title": "Nastavite Daikin klimo"
+            }
+        },
+        "title": "Daikin AC"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/daikin/.translations/zh-Hant.json b/homeassistant/components/daikin/.translations/zh-Hant.json
new file mode 100644
index 00000000000..1699bcad8f0
--- /dev/null
+++ b/homeassistant/components/daikin/.translations/zh-Hant.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u88dd\u7f6e\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "device_fail": "\u5275\u5efa\u88dd\u7f6e\u6642\u767c\u751f\u672a\u77e5\u932f\u8aa4\u3002",
+            "device_timeout": "\u9023\u7dda\u81f3\u88dd\u7f6e\u903e\u6642\u3002"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "\u4e3b\u6a5f\u7aef"
+                },
+                "description": "\u8f38\u5165\u60a8\u7684\u5927\u91d1\u7a7a\u8abf IP \u4f4d\u5740\u3002",
+                "title": "\u8a2d\u5b9a\u5927\u91d1\u7a7a\u8abf"
+            }
+        },
+        "title": "\u5927\u91d1\u7a7a\u8abf\uff08Daikin AC\uff09"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/daikin/__init__.py b/homeassistant/components/daikin/__init__.py
new file mode 100644
index 00000000000..f16d6a87d55
--- /dev/null
+++ b/homeassistant/components/daikin/__init__.py
@@ -0,0 +1,146 @@
+"""
+Platform for the Daikin AC.
+
+For more details about this component, please refer to the documentation
+https://home-assistant.io/components/daikin/
+"""
+import asyncio
+from datetime import timedelta
+import logging
+from socket import timeout
+
+import async_timeout
+import voluptuous as vol
+
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
+from homeassistant.const import CONF_HOSTS
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
+from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.util import Throttle
+
+from . import config_flow  # noqa  pylint_disable=unused-import
+from .const import KEY_HOST
+
+REQUIREMENTS = ['pydaikin==0.9']
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = 'daikin'
+
+
+MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=60)
+
+COMPONENT_TYPES = ['climate', 'sensor']
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Optional(
+            CONF_HOSTS, default=[]
+        ): vol.All(cv.ensure_list, [cv.string]),
+    })
+}, extra=vol.ALLOW_EXTRA)
+
+
+async def async_setup(hass, config):
+    """Establish connection with Daikin."""
+    if DOMAIN not in config:
+        return True
+
+    hosts = config[DOMAIN].get(CONF_HOSTS)
+    if not hosts:
+        hass.async_create_task(
+            hass.config_entries.flow.async_init(
+                DOMAIN, context={'source': SOURCE_IMPORT}))
+    for host in hosts:
+        hass.async_create_task(
+            hass.config_entries.flow.async_init(
+                DOMAIN,
+                context={'source': SOURCE_IMPORT},
+                data={
+                    KEY_HOST: host,
+                }))
+    return True
+
+
+async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry):
+    """Establish connection with Daikin."""
+    conf = entry.data
+    daikin_api = await daikin_api_setup(hass, conf[KEY_HOST])
+    if not daikin_api:
+        return False
+    hass.data.setdefault(DOMAIN, {}).update({entry.entry_id: daikin_api})
+    await asyncio.wait([
+        hass.config_entries.async_forward_entry_setup(entry, component)
+        for component in COMPONENT_TYPES
+    ])
+    return True
+
+
+async def async_unload_entry(hass, config_entry):
+    """Unload a config entry."""
+    await asyncio.wait([
+        hass.config_entries.async_forward_entry_unload(config_entry, component)
+        for component in COMPONENT_TYPES
+    ])
+    hass.data[DOMAIN].pop(config_entry.entry_id)
+    if not hass.data[DOMAIN]:
+        hass.data.pop(DOMAIN)
+    return True
+
+
+async def daikin_api_setup(hass, host):
+    """Create a Daikin instance only once."""
+    from pydaikin.appliance import Appliance
+    try:
+        with async_timeout.timeout(10):
+            device = await hass.async_add_executor_job(Appliance, host)
+    except asyncio.TimeoutError:
+        _LOGGER.error("Connection to Daikin could not be established")
+        return None
+    except Exception:  # pylint: disable=broad-except
+        _LOGGER.error("Unexpected error creating device")
+        return None
+
+    name = device.values['name']
+    api = DaikinApi(device, name)
+
+    return api
+
+
+class DaikinApi:
+    """Keep the Daikin instance in one place and centralize the update."""
+
+    def __init__(self, device, name):
+        """Initialize the Daikin Handle."""
+        self.device = device
+        self.name = name
+        self.ip_address = device.ip
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    def update(self, **kwargs):
+        """Pull the latest data from Daikin."""
+        try:
+            self.device.update_status()
+        except timeout:
+            _LOGGER.warning(
+                "Connection failed for %s", self.ip_address
+            )
+
+    @property
+    def mac(self):
+        """Return mac-address of device."""
+        return self.device.values.get(CONNECTION_NETWORK_MAC)
+
+    @property
+    def device_info(self):
+        """Return a device description for device registry."""
+        info = self.device.values
+        return {
+            'connections': {(CONNECTION_NETWORK_MAC, self.mac)},
+            'identifieres': self.mac,
+            'manufacturer': 'Daikin',
+            'model': info.get('model'),
+            'name': info.get('name'),
+            'sw_version': info.get('ver').replace('_', '.'),
+        }
diff --git a/homeassistant/components/daikin/config_flow.py b/homeassistant/components/daikin/config_flow.py
new file mode 100644
index 00000000000..b46e800c3d8
--- /dev/null
+++ b/homeassistant/components/daikin/config_flow.py
@@ -0,0 +1,74 @@
+"""Config flow for the Daikin platform."""
+import asyncio
+import logging
+
+import async_timeout
+import voluptuous as vol
+
+from homeassistant import config_entries
+
+from .const import KEY_HOST, KEY_IP, KEY_MAC
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@config_entries.HANDLERS.register('daikin')
+class FlowHandler(config_entries.ConfigFlow):
+    """Handle a config flow."""
+
+    VERSION = 1
+    CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_POLL
+
+    async def _create_entry(self, host, mac):
+        """Register new entry."""
+        # Check if mac already is registered
+        for entry in self._async_current_entries():
+            if entry.data[KEY_MAC] == mac:
+                return self.async_abort(reason='already_configured')
+
+        return self.async_create_entry(
+            title=host,
+            data={
+                KEY_HOST: host,
+                KEY_MAC: mac
+            })
+
+    async def _create_device(self, host):
+        """Create device."""
+        from pydaikin.appliance import Appliance
+        try:
+            with async_timeout.timeout(10):
+                device = await self.hass.async_add_executor_job(
+                    Appliance, host)
+        except asyncio.TimeoutError:
+            return self.async_abort(reason='device_timeout')
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception("Unexpected error creating device")
+            return self.async_abort(reason='device_fail')
+
+        mac = device.values.get('mac')
+        return await self._create_entry(host, mac)
+
+    async def async_step_user(self, user_input=None):
+        """User initiated config flow."""
+        if user_input is None:
+            return self.async_show_form(
+                step_id='user',
+                data_schema=vol.Schema({
+                    vol.Required(KEY_HOST): str
+                })
+            )
+        return await self._create_device(user_input[KEY_HOST])
+
+    async def async_step_import(self, user_input):
+        """Import a config entry."""
+        host = user_input.get(KEY_HOST)
+        if not host:
+            return await self.async_step_user()
+        return await self._create_device(host)
+
+    async def async_step_discovery(self, user_input):
+        """Initialize step from discovery."""
+        _LOGGER.info("Discovered device: %s", user_input)
+        return await self._create_entry(user_input[KEY_IP],
+                                        user_input[KEY_MAC])
diff --git a/homeassistant/components/daikin/const.py b/homeassistant/components/daikin/const.py
new file mode 100644
index 00000000000..cd2742b5b5e
--- /dev/null
+++ b/homeassistant/components/daikin/const.py
@@ -0,0 +1,25 @@
+"""Constants for Daikin."""
+from homeassistant.const import CONF_ICON, CONF_NAME, CONF_TYPE
+
+ATTR_TARGET_TEMPERATURE = 'target_temperature'
+ATTR_INSIDE_TEMPERATURE = 'inside_temperature'
+ATTR_OUTSIDE_TEMPERATURE = 'outside_temperature'
+
+SENSOR_TYPE_TEMPERATURE = 'temperature'
+
+SENSOR_TYPES = {
+    ATTR_INSIDE_TEMPERATURE: {
+        CONF_NAME: 'Inside Temperature',
+        CONF_ICON: 'mdi:thermometer',
+        CONF_TYPE: SENSOR_TYPE_TEMPERATURE
+    },
+    ATTR_OUTSIDE_TEMPERATURE: {
+        CONF_NAME: 'Outside Temperature',
+        CONF_ICON: 'mdi:thermometer',
+        CONF_TYPE: SENSOR_TYPE_TEMPERATURE
+    }
+}
+
+KEY_HOST = 'host'
+KEY_MAC = 'mac'
+KEY_IP = 'ip'
diff --git a/homeassistant/components/daikin/strings.json b/homeassistant/components/daikin/strings.json
new file mode 100644
index 00000000000..4badc8b72d7
--- /dev/null
+++ b/homeassistant/components/daikin/strings.json
@@ -0,0 +1,19 @@
+{
+    "config": {
+        "title": "Daikin AC",
+        "step": {
+            "user": {
+                "title": "Configure Daikin AC",
+                "description": "Enter IP address of your Daikin AC.",
+                "data": {
+                    "host": "Host"
+                }
+            }
+        },
+        "abort": {
+            "device_timeout": "Timeout connecting to the device.",
+            "device_fail": "Unexpected error creating device.",
+            "already_configured": "Device is already configured"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/deconz/.translations/ca.json b/homeassistant/components/deconz/.translations/ca.json
index a3aa5491e23..87189a93806 100644
--- a/homeassistant/components/deconz/.translations/ca.json
+++ b/homeassistant/components/deconz/.translations/ca.json
@@ -14,7 +14,7 @@
                     "host": "Amfitri\u00f3",
                     "port": "Port"
                 },
-                "title": "Definiu la passarel\u00b7la deCONZ"
+                "title": "Definici\u00f3 de la passarel\u00b7la deCONZ"
             },
             "link": {
                 "description": "Desbloqueja la teva passarel\u00b7la d'enlla\u00e7 deCONZ per a registrar-te amb Home Assistant.\n\n1. V\u00e9s a la configuraci\u00f3 del sistema deCONZ\n2. Prem el bot\u00f3 \"Desbloquejar passarel\u00b7la\"",
@@ -23,7 +23,7 @@
             "options": {
                 "data": {
                     "allow_clip_sensor": "Permet la importaci\u00f3 de sensors virtuals",
-                    "allow_deconz_groups": "Permet la importaci\u00f3 de grups deCONZ"
+                    "allow_deconz_groups": "Permetre la importaci\u00f3 de grups deCONZ"
                 },
                 "title": "Opcions de configuraci\u00f3 addicionals per deCONZ"
             }
diff --git a/homeassistant/components/deconz/.translations/hu.json b/homeassistant/components/deconz/.translations/hu.json
index ca2466e9921..fbb5c26ba04 100644
--- a/homeassistant/components/deconz/.translations/hu.json
+++ b/homeassistant/components/deconz/.translations/hu.json
@@ -22,8 +22,10 @@
             },
             "options": {
                 "data": {
-                    "allow_clip_sensor": "Virtu\u00e1lis szenzorok import\u00e1l\u00e1s\u00e1nak enged\u00e9lyez\u00e9se"
-                }
+                    "allow_clip_sensor": "Virtu\u00e1lis szenzorok import\u00e1l\u00e1s\u00e1nak enged\u00e9lyez\u00e9se",
+                    "allow_deconz_groups": "deCONZ csoportok import\u00e1l\u00e1s\u00e1nak enged\u00e9lyez\u00e9se"
+                },
+                "title": "Extra be\u00e1ll\u00edt\u00e1si lehet\u0151s\u00e9gek a deCONZhoz"
             }
         },
         "title": "deCONZ Zigbee gateway"
diff --git a/homeassistant/components/deconz/.translations/lb.json b/homeassistant/components/deconz/.translations/lb.json
index 51cb5419e90..fc05bb8b94e 100644
--- a/homeassistant/components/deconz/.translations/lb.json
+++ b/homeassistant/components/deconz/.translations/lb.json
@@ -28,6 +28,6 @@
                 "title": "Extra Konfiguratiouns Optiounen fir deCONZ"
             }
         },
-        "title": "deCONZ"
+        "title": "deCONZ Zigbee gateway"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/demo.py b/homeassistant/components/demo.py
index 8999087a137..2b9854fbcc7 100644
--- a/homeassistant/components/demo.py
+++ b/homeassistant/components/demo.py
@@ -15,6 +15,7 @@ DEPENDENCIES = ['conversation', 'introduction', 'zone']
 DOMAIN = 'demo'
 
 COMPONENTS_WITH_DEMO_PLATFORM = [
+    'air_quality',
     'alarm_control_panel',
     'binary_sensor',
     'calendar',
diff --git a/homeassistant/components/device_tracker/bluetooth_tracker.py b/homeassistant/components/device_tracker/bluetooth_tracker.py
index d22a1ba7c1f..89f3b95ac1b 100644
--- a/homeassistant/components/device_tracker/bluetooth_tracker.py
+++ b/homeassistant/components/device_tracker/bluetooth_tracker.py
@@ -24,9 +24,15 @@ BT_PREFIX = 'BT_'
 
 CONF_REQUEST_RSSI = 'request_rssi'
 
+CONF_DEVICE_ID = "device_id"
+
+DEFAULT_DEVICE_ID = -1
+
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_TRACK_NEW): cv.boolean,
-    vol.Optional(CONF_REQUEST_RSSI): cv.boolean
+    vol.Optional(CONF_REQUEST_RSSI): cv.boolean,
+    vol.Optional(CONF_DEVICE_ID, default=DEFAULT_DEVICE_ID):
+        vol.All(vol.Coerce(int), vol.Range(min=-1))
 })
 
 
@@ -44,11 +50,13 @@ def setup_scanner(hass, config, see, discovery_info=None):
         see(mac="{}{}".format(BT_PREFIX, mac), host_name=name,
             attributes=attributes, source_type=SOURCE_TYPE_BLUETOOTH)
 
+    device_id = config.get(CONF_DEVICE_ID)
+
     def discover_devices():
         """Discover Bluetooth devices."""
         result = bluetooth.discover_devices(
             duration=8, lookup_names=True, flush_cache=True,
-            lookup_class=False)
+            lookup_class=False, device_id=device_id)
         _LOGGER.debug("Bluetooth devices discovered = %d", len(result))
         return result
 
diff --git a/homeassistant/components/device_tracker/freebox.py b/homeassistant/components/device_tracker/freebox.py
index b96ee710044..f4e1ce5bd8a 100644
--- a/homeassistant/components/device_tracker/freebox.py
+++ b/homeassistant/components/device_tracker/freebox.py
@@ -1,56 +1,25 @@
 """
-Support for device tracking through Freebox routers.
+Support for Freebox devices (Freebox v6 and Freebox mini 4K).
 
-This tracker keeps track of the devices connected to the configured Freebox.
-
-For more details about this platform, please refer to the documentation at
+For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/device_tracker.freebox/
 """
-import asyncio
-import copy
-import logging
-import socket
 from collections import namedtuple
-from datetime import timedelta
+import logging
 
-import voluptuous as vol
+from homeassistant.components.device_tracker import DeviceScanner
+from homeassistant.components.freebox import DATA_FREEBOX
 
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.event import async_track_time_interval
-from homeassistant.components.device_tracker import (
-    PLATFORM_SCHEMA, CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)
-from homeassistant.const import (
-    CONF_HOST, CONF_PORT)
-
-REQUIREMENTS = ['aiofreepybox==0.0.5']
+DEPENDENCIES = ['freebox']
 
 _LOGGER = logging.getLogger(__name__)
 
-FREEBOX_CONFIG_FILE = 'freebox.conf'
-
-PLATFORM_SCHEMA = vol.All(
-    PLATFORM_SCHEMA.extend({
-        vol.Required(CONF_HOST): cv.string,
-        vol.Required(CONF_PORT): cv.port
-    }))
-
-MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10)
-
-
-async def async_setup_scanner(hass, config, async_see, discovery_info=None):
-    """Set up the Freebox device tracker and start the polling."""
-    freebox_config = copy.deepcopy(config)
-    if discovery_info is not None:
-        freebox_config[CONF_HOST] = discovery_info['properties']['api_domain']
-        freebox_config[CONF_PORT] = discovery_info['properties']['https_port']
-        _LOGGER.info("Discovered Freebox server: %s:%s",
-                     freebox_config[CONF_HOST], freebox_config[CONF_PORT])
-
-    scanner = FreeboxDeviceScanner(hass, freebox_config, async_see)
-    interval = freebox_config.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)
-    await scanner.async_start(hass, interval)
-    return True
 
+async def async_get_scanner(hass, config):
+    """Validate the configuration and return a Freebox scanner."""
+    scanner = FreeboxDeviceScanner(hass.data[DATA_FREEBOX])
+    await scanner.async_connect()
+    return scanner if scanner.success_init else None
 
 Device = namedtuple('Device', ['id', 'name', 'ip'])
 
@@ -62,59 +31,41 @@ def _build_device(device_dict):
         device_dict['l3connectivities'][0]['addr'])
 
 
-class FreeboxDeviceScanner:
-    """This class scans for devices connected to the Freebox."""
+class FreeboxDeviceScanner(DeviceScanner):
+    """Queries the Freebox device."""
 
-    def __init__(self, hass, config, async_see):
+    def __init__(self, fbx):
         """Initialize the scanner."""
-        from aiofreepybox import Freepybox
+        self.last_results = {}
+        self.success_init = False
+        self.connection = fbx
 
-        self.host = config[CONF_HOST]
-        self.port = config[CONF_PORT]
-        self.token_file = hass.config.path(FREEBOX_CONFIG_FILE)
-        self.async_see = async_see
+    async def async_connect(self):
+        """Initialize connection to the router."""
+        # Test the router is accessible.
+        data = await self.connection.lan.get_hosts_list()
+        self.success_init = data is not None
 
-        # Hardcode the app description to avoid invalidating the authentication
-        # file at each new version.
-        # The version can be changed if we want the user to re-authorize HASS
-        # on her Freebox.
-        app_desc = {
-            'app_id': 'hass',
-            'app_name': 'Home Assistant',
-            'app_version': '0.65',
-            'device_name': socket.gethostname()
-        }
-
-        api_version = 'v1'  # Use the lowest working version.
-        self.fbx = Freepybox(
-            app_desc=app_desc,
-            token_file=self.token_file,
-            api_version=api_version)
-
-    async def async_start(self, hass, interval):
-        """Perform a first update and start polling at the given interval."""
+    async def async_scan_devices(self):
+        """Scan for new devices and return a list with found device IDs."""
         await self.async_update_info()
-        interval = max(interval, MIN_TIME_BETWEEN_SCANS)
-        async_track_time_interval(hass, self.async_update_info, interval)
+        return [device.id for device in self.last_results]
 
-    async def async_update_info(self, now=None):
-        """Check the Freebox for devices."""
-        from aiofreepybox.exceptions import HttpRequestError
+    async def get_device_name(self, device):
+        """Return the name of the given device or None if we don't know."""
+        name = next((
+            result.name for result in self.last_results
+            if result.id == device), None)
+        return name
 
-        _LOGGER.info('Scanning devices')
+    async def async_update_info(self):
+        """Ensure the information from the Freebox router is up to date."""
+        _LOGGER.debug('Checking Devices')
 
-        await self.fbx.open(self.host, self.port)
-        try:
-            hosts = await self.fbx.lan.get_hosts_list()
-        except HttpRequestError:
-            _LOGGER.exception('Failed to scan devices')
-        else:
-            active_devices = [_build_device(device)
-                              for device in hosts
-                              if device['active']]
+        hosts = await self.connection.lan.get_hosts_list()
 
-            if active_devices:
-                await asyncio.wait([self.async_see(mac=d.id, host_name=d.name)
-                                    for d in active_devices])
+        last_results = [_build_device(device)
+                        for device in hosts
+                        if device['active']]
 
-        await self.fbx.close()
+        self.last_results = last_results
diff --git a/homeassistant/components/device_tracker/huawei_lte.py b/homeassistant/components/device_tracker/huawei_lte.py
index 4b4eb3f001a..d30a413898f 100644
--- a/homeassistant/components/device_tracker/huawei_lte.py
+++ b/homeassistant/components/device_tracker/huawei_lte.py
@@ -23,10 +23,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_URL): cv.url,
 })
 
+HOSTS_PATH = "wlan_host_list.Hosts"
+
 
 def get_scanner(hass, config):
     """Get a Huawei LTE router scanner."""
     data = hass.data[DATA_KEY].get_data(config)
+    data.subscribe(HOSTS_PATH)
     return HuaweiLteScanner(data)
 
 
@@ -43,7 +46,7 @@ class HuaweiLteScanner(DeviceScanner):
         self.data.update()
         self._hosts = {
             x["MacAddress"]: x
-            for x in self.data["wlan_host_list.Hosts.Host"]
+            for x in self.data[HOSTS_PATH + ".Host"]
             if x.get("MacAddress")
         }
         return list(self._hosts)
diff --git a/homeassistant/components/device_tracker/icloud.py b/homeassistant/components/device_tracker/icloud.py
index 8ea81e88440..9ac77cf7f01 100644
--- a/homeassistant/components/device_tracker/icloud.py
+++ b/homeassistant/components/device_tracker/icloud.py
@@ -200,7 +200,9 @@ class Icloud(DeviceScanner):
             self._intervals = {}
             for device in self.api.devices:
                 status = device.status(DEVICESTATUSSET)
+                _LOGGER.debug('Device Status is %s', status)
                 devicename = slugify(status['name'].replace(' ', '', 99))
+                _LOGGER.info('Adding icloud device: %s', devicename)
                 if devicename in self.devices:
                     _LOGGER.error('Multiple devices with name: %s', devicename)
                     continue
@@ -404,6 +406,7 @@ class Icloud(DeviceScanner):
                     continue
 
                 status = device.status(DEVICESTATUSSET)
+                _LOGGER.debug('Device Status is %s', status)
                 dev_id = status['name'].replace(' ', '', 99)
                 dev_id = slugify(dev_id)
                 attrs[ATTR_DEVICESTATUS] = DEVICESTATUSCODES.get(
@@ -441,9 +444,9 @@ class Icloud(DeviceScanner):
             return
 
         self.api.authenticate()
-
         for device in self.api.devices:
-            if devicename is None or device == self.devices[devicename]:
+            if str(device) == str(self.devices[devicename]):
+                _LOGGER.info("Playing Lost iPhone sound for %s", devicename)
                 device.play_sound()
 
     def update_icloud(self, devicename=None):
diff --git a/homeassistant/components/device_tracker/keenetic_ndms2.py b/homeassistant/components/device_tracker/keenetic_ndms2.py
index e9f9791b9f6..b8c2124ff0f 100644
--- a/homeassistant/components/device_tracker/keenetic_ndms2.py
+++ b/homeassistant/components/device_tracker/keenetic_ndms2.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
     CONF_HOST, CONF_PORT, CONF_PASSWORD, CONF_USERNAME
 )
 
-REQUIREMENTS = ['ndms2_client==0.0.5']
+REQUIREMENTS = ['ndms2_client==0.0.6']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/device_tracker/netgear.py b/homeassistant/components/device_tracker/netgear.py
index 99d379fb4d3..49bce932159 100644
--- a/homeassistant/components/device_tracker/netgear.py
+++ b/homeassistant/components/device_tracker/netgear.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
     CONF_HOST, CONF_PASSWORD, CONF_USERNAME, CONF_PORT, CONF_SSL,
     CONF_DEVICES, CONF_EXCLUDE)
 
-REQUIREMENTS = ['pynetgear==0.5.1']
+REQUIREMENTS = ['pynetgear==0.5.2']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/device_tracker/traccar.py b/homeassistant/components/device_tracker/traccar.py
index 982a572fd94..b288b8633d1 100644
--- a/homeassistant/components/device_tracker/traccar.py
+++ b/homeassistant/components/device_tracker/traccar.py
@@ -12,20 +12,22 @@ import voluptuous as vol
 from homeassistant.components.device_tracker import PLATFORM_SCHEMA
 from homeassistant.const import (
     CONF_HOST, CONF_PORT, CONF_SSL, CONF_VERIFY_SSL,
-    CONF_PASSWORD, CONF_USERNAME)
+    CONF_PASSWORD, CONF_USERNAME, ATTR_BATTERY_LEVEL)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.util import slugify
 
 
-REQUIREMENTS = ['pytraccar==0.1.2']
+REQUIREMENTS = ['pytraccar==0.2.1']
 
 _LOGGER = logging.getLogger(__name__)
 
 ATTR_ADDRESS = 'address'
 ATTR_CATEGORY = 'category'
 ATTR_GEOFENCE = 'geofence'
+ATTR_MOTION = 'motion'
+ATTR_SPEED = 'speed'
 ATTR_TRACKER = 'tracker'
 
 DEFAULT_SCAN_INTERVAL = timedelta(seconds=30)
@@ -78,13 +80,21 @@ class TraccarScanner:
         await self._api.get_device_info()
         for devicename in self._api.device_info:
             device = self._api.device_info[devicename]
-            device_attributes = {
-                ATTR_ADDRESS: device['address'],
-                ATTR_GEOFENCE: device['geofence'],
-                ATTR_CATEGORY: device['category'],
-                ATTR_TRACKER: 'traccar'
-                }
+            attr = {}
+            attr[ATTR_TRACKER] = 'traccar'
+            if device.get('address') is not None:
+                attr[ATTR_ADDRESS] = device['address']
+            if device.get('geofence') is not None:
+                attr[ATTR_GEOFENCE] = device['geofence']
+            if device.get('category') is not None:
+                attr[ATTR_CATEGORY] = device['category']
+            if device.get('speed') is not None:
+                attr[ATTR_SPEED] = device['speed']
+            if device.get('battery') is not None:
+                attr[ATTR_BATTERY_LEVEL] = device['battery']
+            if device.get('motion') is not None:
+                attr[ATTR_MOTION] = device['motion']
             await self._async_see(
                 dev_id=slugify(device['device_id']),
-                gps=(device['latitude'], device['longitude']),
-                attributes=device_attributes)
+                gps=(device.get('latitude'), device.get('longitude')),
+                attributes=attr)
diff --git a/homeassistant/components/dialogflow/.translations/ca.json b/homeassistant/components/dialogflow/.translations/ca.json
index ffc10269776..f6dfc9399c2 100644
--- a/homeassistant/components/dialogflow/.translations/ca.json
+++ b/homeassistant/components/dialogflow/.translations/ca.json
@@ -1,16 +1,16 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "La vostra inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de Dialogflow.",
+            "not_internet_accessible": "La inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de Dialogflow.",
             "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
         },
         "create_entry": {
-            "default": "Per enviar esdeveniments a Home Assistant, haureu de configurar [integraci\u00f3 webhook de Dialogflow]({dialogflow_url}). \n\n Ompliu la informaci\u00f3 seg\u00fcent: \n\n - URL: `{webhook_url}` \n - M\u00e8tode: POST \n - Tipus de contingut: application/json\n\nVegeu [la documentaci\u00f3]({docs_url}) per a m\u00e9s detalls."
+            "default": "Per enviar esdeveniments a Home Assistant, haur\u00e0s de configurar la [integraci\u00f3 webhook de Dialogflow]({dialogflow_url}). \n\n Completa la seg\u00fcent informaci\u00f3: \n\n- URL: `{webhook_url}` \n- M\u00e8tode: POST \n- Tipus de contingut: application/json\n\nConsulta la [documentaci\u00f3]({docs_url}) per a m\u00e9s detalls."
         },
         "step": {
             "user": {
-                "description": "Esteu segur que voleu configurar Dialogflow?",
-                "title": "Configureu el Webhook de Dialogflow"
+                "description": "Est\u00e0s segur que vols configurar Dialogflow?",
+                "title": "Configuraci\u00f3 del Webhook de Dialogflow"
             }
         },
         "title": "Dialogflow"
diff --git a/homeassistant/components/dialogflow/.translations/hu.json b/homeassistant/components/dialogflow/.translations/hu.json
index 89e8205bb09..89889fd6048 100644
--- a/homeassistant/components/dialogflow/.translations/hu.json
+++ b/homeassistant/components/dialogflow/.translations/hu.json
@@ -1,7 +1,12 @@
 {
     "config": {
+        "abort": {
+            "not_internet_accessible": "A Home Assistant rendszerednek el\u00e9rhet\u0151nek kell lennie az internetr\u0151l a Dialogflow \u00fczenetek fogad\u00e1s\u00e1hoz.",
+            "one_instance_allowed": "Csak egyetlen konfigur\u00e1ci\u00f3 sz\u00fcks\u00e9ges."
+        },
         "step": {
             "user": {
+                "description": "Biztosan be szeretn\u00e9d \u00e1ll\u00edtani az Dialogflowt?",
                 "title": "Dialogflow Webhook be\u00e1ll\u00edt\u00e1sa"
             }
         },
diff --git a/homeassistant/components/discovery.py b/homeassistant/components/discovery.py
index bbf40c73070..f87395520bb 100644
--- a/homeassistant/components/discovery.py
+++ b/homeassistant/components/discovery.py
@@ -21,7 +21,7 @@ from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.helpers.discovery import async_load_platform, async_discover
 import homeassistant.util.dt as dt_util
 
-REQUIREMENTS = ['netdisco==2.2.0']
+REQUIREMENTS = ['netdisco==2.3.0']
 
 DOMAIN = 'discovery'
 
@@ -44,13 +44,20 @@ SERVICE_SABNZBD = 'sabnzbd'
 SERVICE_SAMSUNG_PRINTER = 'samsung_printer'
 SERVICE_HOMEKIT = 'homekit'
 SERVICE_OCTOPRINT = 'octoprint'
+SERVICE_FREEBOX = 'freebox'
+SERVICE_IGD = 'igd'
+SERVICE_DLNA_DMR = 'dlna_dmr'
 
 CONFIG_ENTRY_HANDLERS = {
+    SERVICE_DAIKIN: 'daikin',
     SERVICE_DECONZ: 'deconz',
+    'esphome': 'esphome',
     'google_cast': 'cast',
     SERVICE_HUE: 'hue',
+    SERVICE_TELLDUSLIVE: 'tellduslive',
     SERVICE_IKEA_TRADFRI: 'tradfri',
     'sonos': 'sonos',
+    SERVICE_IGD: 'upnp',
 }
 
 SERVICE_HANDLERS = {
@@ -62,12 +69,11 @@ SERVICE_HANDLERS = {
     SERVICE_APPLE_TV: ('apple_tv', None),
     SERVICE_WINK: ('wink', None),
     SERVICE_XIAOMI_GW: ('xiaomi_aqara', None),
-    SERVICE_TELLDUSLIVE: ('tellduslive', None),
-    SERVICE_DAIKIN: ('daikin', None),
     SERVICE_SABNZBD: ('sabnzbd', None),
     SERVICE_SAMSUNG_PRINTER: ('sensor', 'syncthru'),
     SERVICE_KONNECTED: ('konnected', None),
     SERVICE_OCTOPRINT: ('octoprint', None),
+    SERVICE_FREEBOX: ('freebox', None),
     'panasonic_viera': ('media_player', 'panasonic_viera'),
     'plex_mediaserver': ('media_player', 'plex'),
     'roku': ('media_player', 'roku'),
@@ -87,12 +93,11 @@ SERVICE_HANDLERS = {
     'volumio': ('media_player', 'volumio'),
     'lg_smart_device': ('media_player', 'lg_soundbar'),
     'nanoleaf_aurora': ('light', 'nanoleaf_aurora'),
-    'freebox': ('device_tracker', 'freebox'),
 }
 
 OPTIONAL_SERVICE_HANDLERS = {
     SERVICE_HOMEKIT: ('homekit_controller', None),
-    'dlna_dmr': ('media_player', 'dlna_dmr'),
+    SERVICE_DLNA_DMR: ('media_player', 'dlna_dmr'),
 }
 
 CONF_IGNORE = 'ignore'
@@ -134,7 +139,7 @@ async def async_setup(hass, config):
 
         discovery_hash = json.dumps([service, info], sort_keys=True)
         if discovery_hash in already_discovered:
-            logger.debug("Already discoverd service %s %s.", service, info)
+            logger.debug("Already discovered service %s %s.", service, info)
             return
 
         already_discovered.add(discovery_hash)
@@ -169,20 +174,23 @@ async def async_setup(hass, config):
 
     async def scan_devices(now):
         """Scan for devices."""
-        results = await hass.async_add_job(_discover, netdisco)
+        try:
+            results = await hass.async_add_job(_discover, netdisco)
 
-        for result in results:
-            hass.async_create_task(new_service_found(*result))
+            for result in results:
+                hass.async_create_task(new_service_found(*result))
+        except OSError:
+            logger.error("Network is unreachable")
 
-        async_track_point_in_utc_time(hass, scan_devices,
-                                      dt_util.utcnow() + SCAN_INTERVAL)
+        async_track_point_in_utc_time(
+            hass, scan_devices, dt_util.utcnow() + SCAN_INTERVAL)
 
     @callback
     def schedule_first(event):
         """Schedule the first discovery when Home Assistant starts up."""
         async_track_point_in_utc_time(hass, scan_devices, dt_util.utcnow())
 
-        # discovery local services
+        # Discovery for local services
         if 'HASSIO' in os.environ:
             hass.async_create_task(new_service_found(SERVICE_HASSIO, {}))
 
diff --git a/homeassistant/components/doorbird.py b/homeassistant/components/doorbird.py
index 578855011cc..42d14205e75 100644
--- a/homeassistant/components/doorbird.py
+++ b/homeassistant/components/doorbird.py
@@ -104,7 +104,7 @@ def setup(hass, config):
             return False
 
         # Subscribe to doorbell or motion events
-        if events is not None:
+        if events:
             doorstation.update_schedule(hass)
 
     hass.data[DOMAIN] = doorstations
diff --git a/homeassistant/components/edp_redy.py b/homeassistant/components/edp_redy.py
index 210d7eb6afc..10780103613 100644
--- a/homeassistant/components/edp_redy.py
+++ b/homeassistant/components/edp_redy.py
@@ -26,7 +26,7 @@ EDP_REDY = 'edp_redy'
 DATA_UPDATE_TOPIC = '{0}_data_update'.format(DOMAIN)
 UPDATE_INTERVAL = 60
 
-REQUIREMENTS = ['edp_redy==0.0.2']
+REQUIREMENTS = ['edp_redy==0.0.3']
 
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.Schema({
diff --git a/homeassistant/components/eight_sleep.py b/homeassistant/components/eight_sleep.py
index 209fa7ba879..8c36830817e 100644
--- a/homeassistant/components/eight_sleep.py
+++ b/homeassistant/components/eight_sleep.py
@@ -21,7 +21,7 @@ from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.util.dt import utcnow
 
-REQUIREMENTS = ['pyeight==0.0.9']
+REQUIREMENTS = ['pyeight==0.1.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/envisalink.py b/homeassistant/components/envisalink/__init__.py
similarity index 86%
rename from homeassistant/components/envisalink.py
rename to homeassistant/components/envisalink/__init__.py
index e96810a8083..c6b694c7f5f 100644
--- a/homeassistant/components/envisalink.py
+++ b/homeassistant/components/envisalink/__init__.py
@@ -11,12 +11,12 @@ import voluptuous as vol
 
 from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
-from homeassistant.const import EVENT_HOMEASSISTANT_STOP
+from homeassistant.const import EVENT_HOMEASSISTANT_STOP, CONF_TIMEOUT
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
-REQUIREMENTS = ['pyenvisalink==3.7']
+REQUIREMENTS = ['pyenvisalink==3.8']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -46,6 +46,7 @@ DEFAULT_KEEPALIVE = 60
 DEFAULT_ZONEDUMP_INTERVAL = 30
 DEFAULT_ZONETYPE = 'opening'
 DEFAULT_PANIC = 'Police'
+DEFAULT_TIMEOUT = 10
 
 SIGNAL_ZONE_UPDATE = 'envisalink.zones_updated'
 SIGNAL_PARTITION_UPDATE = 'envisalink.partition_updated'
@@ -65,7 +66,7 @@ CONFIG_SCHEMA = vol.Schema({
             vol.All(cv.string, vol.In(['HONEYWELL', 'DSC'])),
         vol.Required(CONF_USERNAME): cv.string,
         vol.Required(CONF_PASS): cv.string,
-        vol.Required(CONF_CODE): cv.string,
+        vol.Optional(CONF_CODE): cv.string,
         vol.Optional(CONF_PANIC, default=DEFAULT_PANIC): cv.string,
         vol.Optional(CONF_ZONES): {vol.Coerce(int): ZONE_SCHEMA},
         vol.Optional(CONF_PARTITIONS): {vol.Coerce(int): PARTITION_SCHEMA},
@@ -77,9 +78,21 @@ CONFIG_SCHEMA = vol.Schema({
         vol.Optional(
             CONF_ZONEDUMP_INTERVAL,
             default=DEFAULT_ZONEDUMP_INTERVAL): vol.Coerce(int),
+        vol.Optional(
+            CONF_TIMEOUT,
+            default=DEFAULT_TIMEOUT): vol.Coerce(int),
     }),
 }, extra=vol.ALLOW_EXTRA)
 
+SERVICE_CUSTOM_FUNCTION = 'invoke_custom_function'
+ATTR_CUSTOM_FUNCTION = 'pgm'
+ATTR_PARTITION = 'partition'
+
+SERVICE_SCHEMA = vol.Schema({
+    vol.Required(ATTR_CUSTOM_FUNCTION): cv.string,
+    vol.Required(ATTR_PARTITION): cv.string,
+})
+
 
 async def async_setup(hass, config):
     """Set up for Envisalink devices."""
@@ -99,11 +112,12 @@ async def async_setup(hass, config):
     zone_dump = conf.get(CONF_ZONEDUMP_INTERVAL)
     zones = conf.get(CONF_ZONES)
     partitions = conf.get(CONF_PARTITIONS)
+    connection_timeout = conf.get(CONF_TIMEOUT)
     sync_connect = asyncio.Future(loop=hass.loop)
 
     controller = EnvisalinkAlarmPanel(
         host, port, panel_type, version, user, password, zone_dump,
-        keep_alive, hass.loop)
+        keep_alive, hass.loop, connection_timeout)
     hass.data[DATA_EVL] = controller
 
     @callback
@@ -153,6 +167,12 @@ async def async_setup(hass, config):
         _LOGGER.info("Shutting down Envisalink")
         controller.stop()
 
+    async def handle_custom_function(call):
+        """Handle custom/PGM service."""
+        custom_function = call.data.get(ATTR_CUSTOM_FUNCTION)
+        partition = call.data.get(ATTR_PARTITION)
+        controller.command_output(code, partition, custom_function)
+
     controller.callback_zone_timer_dump = zones_updated_callback
     controller.callback_zone_state_change = zones_updated_callback
     controller.callback_partition_state_change = partition_updated_callback
@@ -190,6 +210,11 @@ async def async_setup(hass, config):
             }, config
         ))
 
+    hass.services.async_register(DOMAIN,
+                                 SERVICE_CUSTOM_FUNCTION,
+                                 handle_custom_function,
+                                 schema=SERVICE_SCHEMA)
+
     return True
 
 
diff --git a/homeassistant/components/envisalink/services.yaml b/homeassistant/components/envisalink/services.yaml
new file mode 100644
index 00000000000..e31aa804059
--- /dev/null
+++ b/homeassistant/components/envisalink/services.yaml
@@ -0,0 +1,15 @@
+# Describes the format for available Envisalink services.
+
+invoke_custom_function:
+  description: >
+    Allows users with DSC panels to trigger a PGM output (1-4).
+    Note that you need to specify the alarm panel's "code" parameter for this to work.
+  fields:
+    partition:
+      description: >
+        The alarm panel partition to trigger the PGM output on.
+        Typically this is just "1".
+      example: "1"
+    pgm:
+      description: The PGM number to trigger on the alarm panel. This will be 1-4.
+      example: "2"
diff --git a/homeassistant/components/esphome/.translations/ca.json b/homeassistant/components/esphome/.translations/ca.json
new file mode 100644
index 00000000000..9fe0bb5e9d0
--- /dev/null
+++ b/homeassistant/components/esphome/.translations/ca.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "ESP ja est\u00e0 configurat"
+        },
+        "error": {
+            "connection_error": "No s'ha pogut connectar amb ESP. Verifica que l'arxiu YAML cont\u00e9 la l\u00ednia 'api:'.",
+            "invalid_password": "Contrasenya inv\u00e0lida!",
+            "resolve_error": "No s'ha pogut trobar l'adre\u00e7a de l'ESP. Si l'error persisteix, configura una adre\u00e7a IP est\u00e0tica: https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips"
+        },
+        "step": {
+            "authenticate": {
+                "data": {
+                    "password": "Contrasenya"
+                },
+                "description": "Introdueix la contrasenya que has posat en la teva configuraci\u00f3.",
+                "title": "Introdueix la contrasenya"
+            },
+            "user": {
+                "data": {
+                    "host": "Amfitri\u00f3",
+                    "port": "Port"
+                },
+                "description": "Introdueix la informaci\u00f3 de connexi\u00f3 del teu node [ESPHome](https://esphomelib.com/).",
+                "title": "ESPHome"
+            }
+        },
+        "title": "ESPHome"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/esphome/.translations/en.json b/homeassistant/components/esphome/.translations/en.json
new file mode 100644
index 00000000000..53331ebc0a9
--- /dev/null
+++ b/homeassistant/components/esphome/.translations/en.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "ESP is already configured"
+        },
+        "error": {
+            "connection_error": "Can't connect to ESP. Please make sure your YAML file contains an 'api:' line.",
+            "invalid_password": "Invalid password!",
+            "resolve_error": "Can't resolve address of the ESP. If this error persists, please set a static IP address: https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips"
+        },
+        "step": {
+            "authenticate": {
+                "data": {
+                    "password": "Password"
+                },
+                "description": "Please enter the password you set in your configuration.",
+                "title": "Enter Password"
+            },
+            "user": {
+                "data": {
+                    "host": "Host",
+                    "port": "Port"
+                },
+                "description": "Please enter connection settings of your [ESPHome](https://esphomelib.com/) node.",
+                "title": "ESPHome"
+            }
+        },
+        "title": "ESPHome"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/esphome/.translations/ko.json b/homeassistant/components/esphome/.translations/ko.json
new file mode 100644
index 00000000000..dc1fcaf0bd1
--- /dev/null
+++ b/homeassistant/components/esphome/.translations/ko.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "ESP \uac00 \uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4"
+        },
+        "error": {
+            "connection_error": "ESP \uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. YAML \ud30c\uc77c\uc5d0 'api :' \ub97c \uad6c\uc131\ud588\ub294\uc9c0 \ud655\uc778\ud574\uc8fc\uc138\uc694.",
+            "invalid_password": "\uc798\ubabb\ub41c \ube44\ubc00\ubc88\ud638",
+            "resolve_error": "ESP \uc758 \uc8fc\uc18c\ub97c \ud655\uc778\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \uc774 \uc624\ub958\uac00 \uacc4\uc18d \ubc1c\uc0dd\ud558\uba74 \uace0\uc815 IP \uc8fc\uc18c (https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips)\ub97c \uc124\uc815\ud574\uc8fc\uc138\uc694"
+        },
+        "step": {
+            "authenticate": {
+                "data": {
+                    "password": "\ube44\ubc00\ubc88\ud638"
+                },
+                "description": "ESP \uc5d0 \uad6c\uc131\ud55c \ube44\ubc00\ubc88\ud638\ub97c \uc785\ub825\ud574\uc8fc\uc138\uc694.",
+                "title": "\ube44\ubc00\ubc88\ud638 \uc785\ub825"
+            },
+            "user": {
+                "data": {
+                    "host": "\ud638\uc2a4\ud2b8",
+                    "port": "\ud3ec\ud2b8"
+                },
+                "description": "[ESPHome](https://esphomelib.com/) \ub178\ub4dc\uc758 \uc5f0\uacb0 \uad6c\uc131\uc744 \uc785\ub825\ud574\uc8fc\uc138\uc694.",
+                "title": "ESPHome"
+            }
+        },
+        "title": "ESPHome"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/esphome/.translations/lb.json b/homeassistant/components/esphome/.translations/lb.json
new file mode 100644
index 00000000000..13dddd0beca
--- /dev/null
+++ b/homeassistant/components/esphome/.translations/lb.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "ESP ass scho konfigur\u00e9iert"
+        },
+        "error": {
+            "connection_error": "Keng Verbindung zum ESP. Iwwerpr\u00e9ift d'Pr\u00e4sens vun der Zeil api: am YAML Fichier.",
+            "invalid_password": "Ong\u00ebltegt Passwuert!",
+            "resolve_error": "Kann d'Adresse vum ESP net opl\u00e9isen. Falls d\u00ebse Problem weiderhi besteet dann defin\u00e9iert eng statesch IP Adresse:\nhttps://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips"
+        },
+        "step": {
+            "authenticate": {
+                "data": {
+                    "password": "Passwuert"
+                },
+                "description": "Gitt d'Passwuert vun \u00e4rer Konfiguratioun an.",
+                "title": "Passwuert aginn"
+            },
+            "user": {
+                "data": {
+                    "host": "Apparat",
+                    "port": "Port"
+                },
+                "description": "Gitt Verbindungs Informatioune vun \u00e4rem [ESPHome](https://esphomelib.com/) an.",
+                "title": "ESPHome"
+            }
+        },
+        "title": "ESPHome"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/esphome/.translations/ru.json b/homeassistant/components/esphome/.translations/ru.json
new file mode 100644
index 00000000000..4b227bd1565
--- /dev/null
+++ b/homeassistant/components/esphome/.translations/ru.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
+        },
+        "error": {
+            "connection_error": "\u041d\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a ESP. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0443\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u0432\u0430\u0448 YAML-\u0444\u0430\u0439\u043b \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0441\u0442\u0440\u043e\u043a\u0443 'api:'.",
+            "invalid_password": "\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c!",
+            "resolve_error": "\u041d\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044f \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0430\u0434\u0440\u0435\u0441 ESP. \u0415\u0441\u043b\u0438 \u044d\u0442\u0430 \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u043e\u0432\u0442\u043e\u0440\u044f\u0435\u0442\u0441\u044f, \u0443\u043a\u0430\u0436\u0438\u0442\u0435 [\u0441\u0442\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439 IP-\u0430\u0434\u0440\u0435\u0441](https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips)"
+        },
+        "step": {
+            "authenticate": {
+                "data": {
+                    "password": "\u041f\u0430\u0440\u043e\u043b\u044c"
+                },
+                "description": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043f\u0430\u0440\u043e\u043b\u044c, \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u044b\u0439 \u0432 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438.",
+                "title": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043f\u0430\u0440\u043e\u043b\u044c"
+            },
+            "user": {
+                "data": {
+                    "host": "\u0425\u043e\u0441\u0442",
+                    "port": "\u041f\u043e\u0440\u0442"
+                },
+                "description": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u043a \u0412\u0430\u0448\u0435\u043c\u0443 [ESPHome](https://esphomelib.com/).",
+                "title": "ESPHome"
+            }
+        },
+        "title": "ESPHome"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/esphome/.translations/sl.json b/homeassistant/components/esphome/.translations/sl.json
new file mode 100644
index 00000000000..7745c455015
--- /dev/null
+++ b/homeassistant/components/esphome/.translations/sl.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "ESP je \u017ee konfiguriran"
+        },
+        "error": {
+            "connection_error": "Ne morem se povezati z ESP. Poskrbite, da va\u0161a datoteka YAML vsebuje vrstico \"api:\".",
+            "invalid_password": "Neveljavno geslo!",
+            "resolve_error": "Ne moremo razre\u0161iti naslova ESP. \u010ce se napaka ponovi, prosimo nastavite stati\u010dni IP naslov: https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips"
+        },
+        "step": {
+            "authenticate": {
+                "data": {
+                    "password": "Geslo"
+                },
+                "description": "Vnesite geslo, ki ste ga nastavili v svoji konfiguraciji.",
+                "title": "Vnesite geslo"
+            },
+            "user": {
+                "data": {
+                    "host": "Gostitelj",
+                    "port": "Vrata"
+                },
+                "description": "Prosimo, vnesite nastavitve povezave va\u0161ega vozli\u0161\u010da [ESPHome] (https://esphomelib.com/).",
+                "title": "ESPHome"
+            }
+        },
+        "title": "ESPHome"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/esphome/.translations/zh-Hant.json b/homeassistant/components/esphome/.translations/zh-Hant.json
new file mode 100644
index 00000000000..055100cf077
--- /dev/null
+++ b/homeassistant/components/esphome/.translations/zh-Hant.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "ESP \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+        },
+        "error": {
+            "connection_error": "\u7121\u6cd5\u9023\u7dda\u81f3 ESP\uff0c\u8acb\u78ba\u5b9a\u60a8\u7684 YAML \u6a94\u6848\u5305\u542b\u300capi:\u300d\u8a2d\u5b9a\u5217\u3002",
+            "invalid_password": "\u5bc6\u78bc\u7121\u6548\uff01",
+            "resolve_error": "\u7121\u6cd5\u89e3\u6790 ESP \u4f4d\u5740\uff0c\u5047\u5982\u6b64\u932f\u8aa4\u6301\u7e8c\u767c\u751f\uff0c\u8acb\u53c3\u8003\u8aaa\u660e\u8a2d\u5b9a\u70ba\u975c\u614b\u56fa\u5b9a IP \uff1a https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips"
+        },
+        "step": {
+            "authenticate": {
+                "data": {
+                    "password": "\u5bc6\u78bc"
+                },
+                "description": "\u8acb\u8f38\u5165\u8a2d\u5b9a\u5167\u6240\u8a2d\u5b9a\u4e4b\u5bc6\u78bc\u3002",
+                "title": "\u8f38\u5165\u5bc6\u78bc"
+            },
+            "user": {
+                "data": {
+                    "host": "\u4e3b\u6a5f\u7aef",
+                    "port": "\u901a\u8a0a\u57e0"
+                },
+                "description": "\u8acb\u8f38\u5165 [ESPHome](https://esphomelib.com/) node \u9023\u7dda\u8cc7\u8a0a\u3002",
+                "title": "ESPHome"
+            }
+        },
+        "title": "ESPHome"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/esphome/__init__.py b/homeassistant/components/esphome/__init__.py
new file mode 100644
index 00000000000..70d92250564
--- /dev/null
+++ b/homeassistant/components/esphome/__init__.py
@@ -0,0 +1,557 @@
+"""Support for esphome devices."""
+import asyncio
+import logging
+from typing import Any, Dict, List, Optional, TYPE_CHECKING, Callable
+
+import attr
+import voluptuous as vol
+
+from homeassistant import const
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, \
+    EVENT_HOMEASSISTANT_STOP
+from homeassistant.core import callback, Event
+import homeassistant.helpers.device_registry as dr
+from homeassistant.exceptions import TemplateError
+from homeassistant.helpers import template
+from homeassistant.helpers.dispatcher import async_dispatcher_connect, \
+    async_dispatcher_send
+from homeassistant.helpers.entity import Entity
+from homeassistant.helpers.event import async_track_state_change
+from homeassistant.helpers.template import Template
+from homeassistant.helpers.json import JSONEncoder
+from homeassistant.helpers.storage import Store
+from homeassistant.helpers.typing import HomeAssistantType, ConfigType
+
+# Import config flow so that it's added to the registry
+from .config_flow import EsphomeFlowHandler  # noqa
+
+if TYPE_CHECKING:
+    from aioesphomeapi import APIClient, EntityInfo, EntityState, DeviceInfo, \
+        ServiceCall
+
+DOMAIN = 'esphome'
+REQUIREMENTS = ['aioesphomeapi==1.4.1']
+
+
+DISPATCHER_UPDATE_ENTITY = 'esphome_{entry_id}_update_{component_key}_{key}'
+DISPATCHER_REMOVE_ENTITY = 'esphome_{entry_id}_remove_{component_key}_{key}'
+DISPATCHER_ON_LIST = 'esphome_{entry_id}_on_list'
+DISPATCHER_ON_DEVICE_UPDATE = 'esphome_{entry_id}_on_device_update'
+DISPATCHER_ON_STATE = 'esphome_{entry_id}_on_state'
+
+STORAGE_KEY = 'esphome.{}'
+STORAGE_VERSION = 1
+
+# The HA component types this integration supports
+HA_COMPONENTS = [
+    'binary_sensor',
+    'cover',
+    'fan',
+    'light',
+    'sensor',
+    'switch',
+]
+
+_LOGGER = logging.getLogger(__name__)
+
+# No config schema - only configuration entry
+CONFIG_SCHEMA = vol.Schema({}, extra=vol.ALLOW_EXTRA)
+
+
+@attr.s
+class RuntimeEntryData:
+    """Store runtime data for esphome config entries."""
+
+    entry_id = attr.ib(type=str)
+    client = attr.ib(type='APIClient')
+    store = attr.ib(type=Store)
+    reconnect_task = attr.ib(type=Optional[asyncio.Task], default=None)
+    state = attr.ib(type=Dict[str, Dict[str, Any]], factory=dict)
+    info = attr.ib(type=Dict[str, Dict[str, Any]], factory=dict)
+    available = attr.ib(type=bool, default=False)
+    device_info = attr.ib(type='DeviceInfo', default=None)
+    cleanup_callbacks = attr.ib(type=List[Callable[[], None]], factory=list)
+    disconnect_callbacks = attr.ib(type=List[Callable[[], None]], factory=list)
+
+    def async_update_entity(self, hass: HomeAssistantType, component_key: str,
+                            key: int) -> None:
+        """Schedule the update of an entity."""
+        signal = DISPATCHER_UPDATE_ENTITY.format(
+            entry_id=self.entry_id, component_key=component_key, key=key)
+        async_dispatcher_send(hass, signal)
+
+    def async_remove_entity(self, hass: HomeAssistantType, component_key: str,
+                            key: int) -> None:
+        """Schedule the removal of an entity."""
+        signal = DISPATCHER_REMOVE_ENTITY.format(
+            entry_id=self.entry_id, component_key=component_key, key=key)
+        async_dispatcher_send(hass, signal)
+
+    def async_update_static_infos(self, hass: HomeAssistantType,
+                                  infos: 'List[EntityInfo]') -> None:
+        """Distribute an update of static infos to all platforms."""
+        signal = DISPATCHER_ON_LIST.format(entry_id=self.entry_id)
+        async_dispatcher_send(hass, signal, infos)
+
+    def async_update_state(self, hass: HomeAssistantType,
+                           state: 'EntityState') -> None:
+        """Distribute an update of state information to all platforms."""
+        signal = DISPATCHER_ON_STATE.format(entry_id=self.entry_id)
+        async_dispatcher_send(hass, signal, state)
+
+    def async_update_device_state(self, hass: HomeAssistantType) -> None:
+        """Distribute an update of a core device state like availability."""
+        signal = DISPATCHER_ON_DEVICE_UPDATE.format(entry_id=self.entry_id)
+        async_dispatcher_send(hass, signal)
+
+    async def async_load_from_store(self) -> List['EntityInfo']:
+        """Load the retained data from store and return de-serialized data."""
+        # pylint: disable= redefined-outer-name
+        from aioesphomeapi import COMPONENT_TYPE_TO_INFO, DeviceInfo
+
+        restored = await self.store.async_load()
+        if restored is None:
+            return []
+
+        self.device_info = _attr_obj_from_dict(DeviceInfo,
+                                               **restored.pop('device_info'))
+        infos = []
+        for comp_type, restored_infos in restored.items():
+            if comp_type not in COMPONENT_TYPE_TO_INFO:
+                continue
+            for info in restored_infos:
+                cls = COMPONENT_TYPE_TO_INFO[comp_type]
+                infos.append(_attr_obj_from_dict(cls, **info))
+        return infos
+
+    async def async_save_to_store(self) -> None:
+        """Generate dynamic data to store and save it to the filesystem."""
+        store_data = {
+            'device_info': attr.asdict(self.device_info)
+        }
+
+        for comp_type, infos in self.info.items():
+            store_data[comp_type] = [attr.asdict(info)
+                                     for info in infos.values()]
+
+        await self.store.async_save(store_data)
+
+
+def _attr_obj_from_dict(cls, **kwargs):
+    return cls(**{key: kwargs[key] for key in attr.fields_dict(cls)})
+
+
+async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
+    """Stub to allow setting up this component.
+
+    Configuration through YAML is not supported at this time.
+    """
+    return True
+
+
+async def async_setup_entry(hass: HomeAssistantType,
+                            entry: ConfigEntry) -> bool:
+    """Set up the esphome component."""
+    # pylint: disable=redefined-outer-name
+    from aioesphomeapi import APIClient, APIConnectionError
+
+    hass.data.setdefault(DOMAIN, {})
+
+    host = entry.data[CONF_HOST]
+    port = entry.data[CONF_PORT]
+    password = entry.data[CONF_PASSWORD]
+
+    cli = APIClient(hass.loop, host, port, password,
+                    client_info="Home Assistant {}".format(const.__version__))
+
+    # Store client in per-config-entry hass.data
+    store = Store(hass, STORAGE_VERSION, STORAGE_KEY.format(entry.entry_id),
+                  encoder=JSONEncoder)
+    entry_data = hass.data[DOMAIN][entry.entry_id] = RuntimeEntryData(
+        client=cli,
+        entry_id=entry.entry_id,
+        store=store,
+    )
+
+    async def on_stop(event: Event) -> None:
+        """Cleanup the socket client on HA stop."""
+        await _cleanup_instance(hass, entry)
+
+    entry_data.cleanup_callbacks.append(
+        hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, on_stop)
+    )
+
+    @callback
+    def async_on_state(state: 'EntityState') -> None:
+        """Send dispatcher updates when a new state is received."""
+        entry_data.async_update_state(hass, state)
+
+    @callback
+    def async_on_service_call(service: 'ServiceCall') -> None:
+        """Call service when user automation in ESPHome config is triggered."""
+        domain, service_name = service.service.split('.', 1)
+        service_data = service.data
+
+        if service.data_template:
+            try:
+                data_template = {key: Template(value) for key, value in
+                                 service.data_template.items()}
+                template.attach(hass, data_template)
+                service_data.update(template.render_complex(
+                    data_template, service.variables))
+            except TemplateError as ex:
+                _LOGGER.error('Error rendering data template: %s', ex)
+                return
+
+        hass.async_create_task(hass.services.async_call(
+            domain, service_name, service_data, blocking=True))
+
+    async def send_home_assistant_state(entity_id: str, _,
+                                        new_state: Optional[str]) -> None:
+        """Forward Home Assistant states to ESPHome."""
+        if new_state is None:
+            return
+        await cli.send_home_assistant_state(entity_id, new_state)
+
+    @callback
+    def async_on_state_subscription(entity_id: str) -> None:
+        """Subscribe and forward states for requested entities."""
+        unsub = async_track_state_change(
+            hass, entity_id, send_home_assistant_state)
+        entry_data.disconnect_callbacks.append(unsub)
+        # Send initial state
+        hass.async_create_task(send_home_assistant_state(
+            entity_id, None, hass.states.get(entity_id)))
+
+    async def on_login() -> None:
+        """Subscribe to states and list entities on successful API login."""
+        try:
+            entry_data.device_info = await cli.device_info()
+            entry_data.available = True
+            await _async_setup_device_registry(hass, entry,
+                                               entry_data.device_info)
+            entry_data.async_update_device_state(hass)
+
+            entity_infos = await cli.list_entities()
+            entry_data.async_update_static_infos(hass, entity_infos)
+            await cli.subscribe_states(async_on_state)
+            await cli.subscribe_service_calls(async_on_service_call)
+            await cli.subscribe_home_assistant_states(
+                async_on_state_subscription)
+
+            hass.async_create_task(entry_data.async_save_to_store())
+        except APIConnectionError as err:
+            _LOGGER.warning("Error getting initial data: %s", err)
+            # Re-connection logic will trigger after this
+            await cli.disconnect()
+
+    try_connect = await _setup_auto_reconnect_logic(hass, cli, entry, host,
+                                                    on_login)
+
+    # This is a bit of a hack: We schedule complete_setup into the
+    # event loop and return immediately (return True)
+    #
+    # Usually, we should avoid that so that HA can track which components
+    # have been started successfully and which failed to be set up.
+    # That doesn't work here for two reasons:
+    #  - We have our own re-connect logic
+    #  - Before we do the first try_connect() call, we need to make sure
+    #    all dispatcher event listeners have been connected, so
+    #    async_forward_entry_setup needs to be awaited. However, if we
+    #    would await async_forward_entry_setup() in async_setup_entry(),
+    #    we would end up with a deadlock.
+    #
+    # Solution is: complete the setup outside of the async_setup_entry()
+    # function. HA will wait until the first connection attempt is made
+    # before starting up (as it should), but if the first connection attempt
+    # fails we will schedule all next re-connect attempts outside of the
+    # tracked tasks (hass.loop.create_task). This way HA won't stall startup
+    # forever until a connection is successful.
+
+    async def complete_setup() -> None:
+        """Complete the config entry setup."""
+        tasks = []
+        for component in HA_COMPONENTS:
+            tasks.append(hass.config_entries.async_forward_entry_setup(
+                entry, component))
+        await asyncio.wait(tasks)
+
+        infos = await entry_data.async_load_from_store()
+        entry_data.async_update_static_infos(hass, infos)
+
+        # If first connect fails, the next re-connect will be scheduled
+        # outside of _pending_task, in order not to delay HA startup
+        # indefinitely
+        await try_connect(is_disconnect=False)
+
+    hass.async_create_task(complete_setup())
+    return True
+
+
+async def _setup_auto_reconnect_logic(hass: HomeAssistantType,
+                                      cli: 'APIClient',
+                                      entry: ConfigEntry, host: str, on_login):
+    """Set up the re-connect logic for the API client."""
+    from aioesphomeapi import APIConnectionError
+
+    async def try_connect(tries: int = 0, is_disconnect: bool = True) -> None:
+        """Try connecting to the API client. Will retry if not successful."""
+        if entry.entry_id not in hass.data[DOMAIN]:
+            # When removing/disconnecting manually
+            return
+
+        data = hass.data[DOMAIN][entry.entry_id]  # type: RuntimeEntryData
+        for disconnect_cb in data.disconnect_callbacks:
+            disconnect_cb()
+        data.disconnect_callbacks = []
+        data.available = False
+        data.async_update_device_state(hass)
+
+        if is_disconnect:
+            # This can happen often depending on WiFi signal strength.
+            # So therefore all these connection warnings are logged
+            # as infos. The "unavailable" logic will still trigger so the
+            # user knows if the device is not connected.
+            _LOGGER.info("Disconnected from ESPHome API for %s", host)
+
+        if tries != 0:
+            # If not first re-try, wait and print message
+            # Cap wait time at 1 minute. This is because while working on the
+            # device (e.g. soldering stuff), users don't want to have to wait
+            # a long time for their device to show up in HA again (this was
+            # mentioned a lot in early feedback)
+            #
+            # In the future another API will be set up so that the ESP can
+            # notify HA of connectivity directly, but for new we'll use a
+            # really short reconnect interval.
+            wait_time = int(round(min(1.8**tries, 60.0)))
+            _LOGGER.info("Trying to reconnect in %s seconds", wait_time)
+            await asyncio.sleep(wait_time)
+
+        try:
+            await cli.connect(on_stop=try_connect, login=True)
+        except APIConnectionError as error:
+            _LOGGER.info("Can't connect to ESPHome API for %s: %s",
+                         host, error)
+            # Schedule re-connect in event loop in order not to delay HA
+            # startup. First connect is scheduled in tracked tasks.
+            data.reconnect_task = hass.loop.create_task(
+                try_connect(tries + 1, is_disconnect=False))
+        else:
+            _LOGGER.info("Successfully connected to %s", host)
+            hass.async_create_task(on_login())
+
+    return try_connect
+
+
+async def _async_setup_device_registry(hass: HomeAssistantType,
+                                       entry: ConfigEntry,
+                                       device_info: 'DeviceInfo'):
+    """Set up device registry feature for a particular config entry."""
+    sw_version = device_info.esphome_core_version
+    if device_info.compilation_time:
+        sw_version += ' ({})'.format(device_info.compilation_time)
+    device_registry = await dr.async_get_registry(hass)
+    device_registry.async_get_or_create(
+        config_entry_id=entry.entry_id,
+        connections={
+            (dr.CONNECTION_NETWORK_MAC, device_info.mac_address)
+        },
+        name=device_info.name,
+        manufacturer='espressif',
+        model=device_info.model,
+        sw_version=sw_version,
+    )
+
+
+async def _cleanup_instance(hass: HomeAssistantType,
+                            entry: ConfigEntry) -> None:
+    """Cleanup the esphome client if it exists."""
+    data = hass.data[DOMAIN].pop(entry.entry_id)  # type: RuntimeEntryData
+    if data.reconnect_task is not None:
+        data.reconnect_task.cancel()
+    for disconnect_cb in data.disconnect_callbacks:
+        disconnect_cb()
+    for cleanup_callback in data.cleanup_callbacks:
+        cleanup_callback()
+    await data.client.disconnect()
+
+
+async def async_unload_entry(hass: HomeAssistantType,
+                             entry: ConfigEntry) -> bool:
+    """Unload an esphome config entry."""
+    await _cleanup_instance(hass, entry)
+
+    tasks = []
+    for component in HA_COMPONENTS:
+        tasks.append(hass.config_entries.async_forward_entry_unload(
+            entry, component))
+    await asyncio.wait(tasks)
+
+    return True
+
+
+async def platform_async_setup_entry(hass: HomeAssistantType,
+                                     entry: ConfigEntry,
+                                     async_add_entities,
+                                     *,
+                                     component_key: str,
+                                     info_type,
+                                     entity_type,
+                                     state_type
+                                     ) -> None:
+    """Set up an esphome platform.
+
+    This method is in charge of receiving, distributing and storing
+    info and state updates.
+    """
+    entry_data = hass.data[DOMAIN][entry.entry_id]  # type: RuntimeEntryData
+    entry_data.info[component_key] = {}
+    entry_data.state[component_key] = {}
+
+    @callback
+    def async_list_entities(infos: List['EntityInfo']):
+        """Update entities of this platform when entities are listed."""
+        old_infos = entry_data.info[component_key]
+        new_infos = {}
+        add_entities = []
+        for info in infos:
+            if not isinstance(info, info_type):
+                # Filter out infos that don't belong to this platform.
+                continue
+
+            if info.key in old_infos:
+                # Update existing entity
+                old_infos.pop(info.key)
+            else:
+                # Create new entity
+                entity = entity_type(entry.entry_id, component_key, info.key)
+                add_entities.append(entity)
+            new_infos[info.key] = info
+
+        # Remove old entities
+        for info in old_infos.values():
+            entry_data.async_remove_entity(hass, component_key, info.key)
+        entry_data.info[component_key] = new_infos
+        async_add_entities(add_entities)
+
+    signal = DISPATCHER_ON_LIST.format(entry_id=entry.entry_id)
+    entry_data.cleanup_callbacks.append(
+        async_dispatcher_connect(hass, signal, async_list_entities)
+    )
+
+    @callback
+    def async_entity_state(state: 'EntityState'):
+        """Notify the appropriate entity of an updated state."""
+        if not isinstance(state, state_type):
+            return
+        entry_data.state[component_key][state.key] = state
+        entry_data.async_update_entity(hass, component_key, state.key)
+
+    signal = DISPATCHER_ON_STATE.format(entry_id=entry.entry_id)
+    entry_data.cleanup_callbacks.append(
+        async_dispatcher_connect(hass, signal, async_entity_state)
+    )
+
+
+class EsphomeEntity(Entity):
+    """Define a generic esphome entity."""
+
+    def __init__(self, entry_id: str, component_key: str, key: int):
+        """Initialize."""
+        self._entry_id = entry_id
+        self._component_key = component_key
+        self._key = key
+        self._remove_callbacks = []  # type: List[Callable[[], None]]
+
+    async def async_added_to_hass(self) -> None:
+        """Register callbacks."""
+        kwargs = {
+            'entry_id': self._entry_id,
+            'component_key': self._component_key,
+            'key': self._key,
+        }
+        self._remove_callbacks.append(
+            async_dispatcher_connect(self.hass,
+                                     DISPATCHER_UPDATE_ENTITY.format(**kwargs),
+                                     self.async_schedule_update_ha_state)
+        )
+
+        self._remove_callbacks.append(
+            async_dispatcher_connect(self.hass,
+                                     DISPATCHER_REMOVE_ENTITY.format(**kwargs),
+                                     self.async_schedule_update_ha_state)
+        )
+
+        self._remove_callbacks.append(
+            async_dispatcher_connect(
+                self.hass, DISPATCHER_ON_DEVICE_UPDATE.format(**kwargs),
+                self.async_schedule_update_ha_state)
+        )
+
+    async def async_will_remove_from_hass(self):
+        """Unregister callbacks."""
+        for remove_callback in self._remove_callbacks:
+            remove_callback()
+        self._remove_callbacks = []
+
+    @property
+    def _entry_data(self) -> RuntimeEntryData:
+        return self.hass.data[DOMAIN][self._entry_id]
+
+    @property
+    def _static_info(self) -> 'EntityInfo':
+        return self._entry_data.info[self._component_key][self._key]
+
+    @property
+    def _device_info(self) -> 'DeviceInfo':
+        return self._entry_data.device_info
+
+    @property
+    def _client(self) -> 'APIClient':
+        return self._entry_data.client
+
+    @property
+    def _state(self) -> 'Optional[EntityState]':
+        try:
+            return self._entry_data.state[self._component_key][self._key]
+        except KeyError:
+            return None
+
+    @property
+    def available(self) -> bool:
+        """Return if the entity is available."""
+        device = self._device_info
+
+        if device.has_deep_sleep:
+            # During deep sleep the ESP will not be connectable (by design)
+            # For these cases, show it as available
+            return True
+
+        return self._entry_data.available
+
+    @property
+    def unique_id(self) -> Optional[str]:
+        """Return a unique id identifying the entity."""
+        if not self._static_info.unique_id:
+            return None
+        return self._static_info.unique_id
+
+    @property
+    def device_info(self):
+        """Return device registry information for this entity."""
+        return {
+            'connections': {(dr.CONNECTION_NETWORK_MAC,
+                             self._device_info.mac_address)}
+        }
+
+    @property
+    def name(self) -> str:
+        """Return the name of the entity."""
+        return self._static_info.name
+
+    @property
+    def should_poll(self) -> bool:
+        """Disable polling."""
+        return False
diff --git a/homeassistant/components/esphome/config_flow.py b/homeassistant/components/esphome/config_flow.py
new file mode 100644
index 00000000000..1f71d8d66b5
--- /dev/null
+++ b/homeassistant/components/esphome/config_flow.py
@@ -0,0 +1,136 @@
+"""Config flow to configure esphome component."""
+from collections import OrderedDict
+from typing import Optional
+
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.helpers import ConfigType
+
+
+@config_entries.HANDLERS.register('esphome')
+class EsphomeFlowHandler(config_entries.ConfigFlow):
+    """Handle a esphome config flow."""
+
+    VERSION = 1
+    CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_PUSH
+
+    def __init__(self):
+        """Initialize flow."""
+        self._host = None  # type: Optional[str]
+        self._port = None  # type: Optional[int]
+        self._password = None  # type: Optional[str]
+        self._name = None  # type: Optional[str]
+
+    async def async_step_user(self, user_input: Optional[ConfigType] = None,
+                              error: Optional[str] = None):
+        """Handle a flow initialized by the user."""
+        if user_input is not None:
+            self._host = user_input['host']
+            self._port = user_input['port']
+            error, device_info = await self.fetch_device_info()
+            if error is not None:
+                return await self.async_step_user(error=error)
+            self._name = device_info.name
+
+            # Only show authentication step if device uses password
+            if device_info.uses_password:
+                return await self.async_step_authenticate()
+
+            return self._async_get_entry()
+
+        fields = OrderedDict()
+        fields[vol.Required('host', default=self._host or vol.UNDEFINED)] = str
+        fields[vol.Optional('port', default=self._port or 6053)] = int
+
+        errors = {}
+        if error is not None:
+            errors['base'] = error
+
+        return self.async_show_form(
+            step_id='user',
+            data_schema=vol.Schema(fields),
+            errors=errors
+        )
+
+    async def async_step_discovery(self, user_input: ConfigType):
+        """Handle discovery."""
+        # mDNS hostname has additional '.' at end
+        hostname = user_input['hostname'][:-1]
+        hosts = (hostname, user_input['host'])
+        for entry in self._async_current_entries():
+            if entry.data['host'] in hosts:
+                return self.async_abort(
+                    reason='already_configured'
+                )
+
+        # Prefer .local addresses (mDNS is available after all, otherwise
+        # we wouldn't have received the discovery message)
+        return await self.async_step_user(user_input={
+            'host': hostname,
+            'port': user_input['port'],
+        })
+
+    def _async_get_entry(self):
+        return self.async_create_entry(
+            title=self._name,
+            data={
+                'host': self._host,
+                'port': self._port,
+                # The API uses protobuf, so empty string denotes absence
+                'password': self._password or '',
+            }
+        )
+
+    async def async_step_authenticate(self, user_input=None, error=None):
+        """Handle getting password for authentication."""
+        if user_input is not None:
+            self._password = user_input['password']
+            error = await self.try_login()
+            if error:
+                return await self.async_step_authenticate(error=error)
+            return self._async_get_entry()
+
+        errors = {}
+        if error is not None:
+            errors['base'] = error
+
+        return self.async_show_form(
+            step_id='authenticate',
+            data_schema=vol.Schema({
+                vol.Required('password'): str
+            }),
+            errors=errors
+        )
+
+    async def fetch_device_info(self):
+        """Fetch device info from API and return any errors."""
+        from aioesphomeapi import APIClient, APIConnectionError
+
+        cli = APIClient(self.hass.loop, self._host, self._port, '')
+
+        try:
+            await cli.connect()
+            device_info = await cli.device_info()
+        except APIConnectionError as err:
+            if 'resolving' in str(err):
+                return 'resolve_error', None
+            return 'connection_error', None
+        finally:
+            await cli.disconnect(force=True)
+
+        return None, device_info
+
+    async def try_login(self):
+        """Try logging in to device and return any errors."""
+        from aioesphomeapi import APIClient, APIConnectionError
+
+        cli = APIClient(self.hass.loop, self._host, self._port, self._password)
+
+        try:
+            await cli.connect(login=True)
+        except APIConnectionError:
+            await cli.disconnect(force=True)
+            return 'invalid_password'
+
+        return None
diff --git a/homeassistant/components/esphome/strings.json b/homeassistant/components/esphome/strings.json
new file mode 100644
index 00000000000..56eeed8ea41
--- /dev/null
+++ b/homeassistant/components/esphome/strings.json
@@ -0,0 +1,30 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "ESP is already configured"
+        },
+        "error": {
+            "resolve_error": "Can't resolve address of the ESP. If this error persists, please set a static IP address: https://esphomelib.com/esphomeyaml/components/wifi.html#manual-ips",
+            "connection_error": "Can't connect to ESP. Please make sure your YAML file contains an 'api:' line.",
+            "invalid_password": "Invalid password!"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Host",
+                    "port": "Port"
+                },
+                "description": "Please enter connection settings of your [ESPHome](https://esphomelib.com/) node.",
+                "title": "ESPHome"
+            },
+            "authenticate": {
+                "data": {
+                    "password": "Password"
+                },
+                "description": "Please enter the password you set in your configuration.",
+                "title": "Enter Password"
+            }
+        },
+        "title": "ESPHome"
+    }
+}
diff --git a/homeassistant/components/eufy.py b/homeassistant/components/eufy.py
index 31a4dddd424..c1166f8cf7b 100644
--- a/homeassistant/components/eufy.py
+++ b/homeassistant/components/eufy.py
@@ -15,7 +15,7 @@ from homeassistant.helpers import discovery
 import homeassistant.helpers.config_validation as cv
 
 
-REQUIREMENTS = ['lakeside==0.10']
+REQUIREMENTS = ['lakeside==0.11']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -43,6 +43,7 @@ EUFY_DISPATCH = {
     'T1013': 'light',
     'T1201': 'switch',
     'T1202': 'switch',
+    'T1203': 'switch',
     'T1211': 'switch'
 }
 
diff --git a/homeassistant/components/fan/__init__.py b/homeassistant/components/fan/__init__.py
index 36b075747e0..a54d52f4b12 100644
--- a/homeassistant/components/fan/__init__.py
+++ b/homeassistant/components/fan/__init__.py
@@ -61,30 +61,30 @@ PROP_TO_ATTR = {
 }  # type: dict
 
 FAN_SET_SPEED_SCHEMA = vol.Schema({
-    vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Required(ATTR_SPEED): cv.string
 })  # type: dict
 
 FAN_TURN_ON_SCHEMA = vol.Schema({
-    vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Optional(ATTR_SPEED): cv.string
 })  # type: dict
 
 FAN_TURN_OFF_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids
 })  # type: dict
 
 FAN_OSCILLATE_SCHEMA = vol.Schema({
-    vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Required(ATTR_OSCILLATING): cv.boolean
 })  # type: dict
 
 FAN_TOGGLE_SCHEMA = vol.Schema({
-    vol.Required(ATTR_ENTITY_ID): cv.entity_ids
+    vol.Required(ATTR_ENTITY_ID): cv.comp_entity_ids
 })
 
 FAN_SET_DIRECTION_SCHEMA = vol.Schema({
-    vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Optional(ATTR_DIRECTION): cv.string
 })  # type: dict
 
diff --git a/homeassistant/components/fan/esphome.py b/homeassistant/components/fan/esphome.py
new file mode 100644
index 00000000000..a2a3d6263f8
--- /dev/null
+++ b/homeassistant/components/fan/esphome.py
@@ -0,0 +1,116 @@
+"""Support for ESPHome fans."""
+import logging
+from typing import List, Optional, TYPE_CHECKING
+
+from homeassistant.components.esphome import EsphomeEntity, \
+    platform_async_setup_entry
+from homeassistant.components.fan import FanEntity, SPEED_HIGH, SPEED_LOW, \
+    SPEED_MEDIUM, SUPPORT_OSCILLATE, SUPPORT_SET_SPEED, SPEED_OFF
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.helpers.typing import HomeAssistantType
+
+if TYPE_CHECKING:
+    # pylint: disable=unused-import
+    from aioesphomeapi import FanInfo, FanState  # noqa
+
+DEPENDENCIES = ['esphome']
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(hass: HomeAssistantType,
+                            entry: ConfigEntry, async_add_entities) -> None:
+    """Set up ESPHome fans based on a config entry."""
+    # pylint: disable=redefined-outer-name
+    from aioesphomeapi import FanInfo, FanState  # noqa
+
+    await platform_async_setup_entry(
+        hass, entry, async_add_entities,
+        component_key='fan',
+        info_type=FanInfo, entity_type=EsphomeFan,
+        state_type=FanState
+    )
+
+
+FAN_SPEED_STR_TO_INT = {
+    SPEED_LOW: 0,
+    SPEED_MEDIUM: 1,
+    SPEED_HIGH: 2
+}
+FAN_SPEED_INT_TO_STR = {v: k for k, v in FAN_SPEED_STR_TO_INT.items()}
+
+
+class EsphomeFan(EsphomeEntity, FanEntity):
+    """A fan implementation for ESPHome."""
+
+    @property
+    def _static_info(self) -> 'FanInfo':
+        return super()._static_info
+
+    @property
+    def _state(self) -> Optional['FanState']:
+        return super()._state
+
+    async def async_set_speed(self, speed: str) -> None:
+        """Set the speed of the fan."""
+        if speed == SPEED_OFF:
+            await self.async_turn_off()
+            return
+        await self._client.fan_command(
+            self._static_info.key, speed=FAN_SPEED_STR_TO_INT[speed])
+
+    async def async_turn_on(self, speed: Optional[str] = None,
+                            **kwargs) -> None:
+        """Turn on the fan."""
+        if speed == SPEED_OFF:
+            await self.async_turn_off()
+            return
+        data = {'key': self._static_info.key, 'state': True}
+        if speed is not None:
+            data['speed'] = FAN_SPEED_STR_TO_INT[speed]
+        await self._client.fan_command(**data)
+
+    # pylint: disable=arguments-differ
+    async def async_turn_off(self, **kwargs) -> None:
+        """Turn off the fan."""
+        await self._client.fan_command(key=self._static_info.key, state=False)
+
+    async def async_oscillate(self, oscillating: bool):
+        """Oscillate the fan."""
+        await self._client.fan_command(key=self._static_info.key,
+                                       oscillating=oscillating)
+
+    @property
+    def is_on(self) -> Optional[bool]:
+        """Return true if the entity is on."""
+        if self._state is None:
+            return None
+        return self._state.state
+
+    @property
+    def speed(self) -> Optional[str]:
+        """Return the current speed."""
+        if self._state is None:
+            return None
+        return FAN_SPEED_INT_TO_STR[self._state.speed]
+
+    @property
+    def oscillating(self) -> None:
+        """Return the oscillation state."""
+        if self._state is None:
+            return None
+        return self._state.oscillating
+
+    @property
+    def speed_list(self) -> List[str]:
+        """Get the list of available speeds."""
+        return [SPEED_OFF, SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH]
+
+    @property
+    def supported_features(self) -> int:
+        """Flag supported features."""
+        flags = 0
+        if self._static_info.supports_oscillation:
+            flags |= SUPPORT_OSCILLATE
+        if self._static_info.supports_speed:
+            flags |= SUPPORT_SET_SPEED
+        return flags
diff --git a/homeassistant/components/fan/mqtt.py b/homeassistant/components/fan/mqtt.py
index 8f3ec842829..932a4584e2f 100644
--- a/homeassistant/components/fan/mqtt.py
+++ b/homeassistant/components/fan/mqtt.py
@@ -270,7 +270,8 @@ class MqttFan(MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo,
 
     async def async_will_remove_from_hass(self):
         """Unsubscribe when removed."""
-        await subscription.async_unsubscribe_topics(self.hass, self._sub_state)
+        self._sub_state = await subscription.async_unsubscribe_topics(
+            self.hass, self._sub_state)
         await MqttAvailability.async_will_remove_from_hass(self)
 
     @property
diff --git a/homeassistant/components/fan/services.yaml b/homeassistant/components/fan/services.yaml
index b183c6049ee..35a81c7c934 100644
--- a/homeassistant/components/fan/services.yaml
+++ b/homeassistant/components/fan/services.yaml
@@ -209,8 +209,15 @@ wemo_set_humidity:
   description: Set the target humidity of WeMo humidifier devices.
   fields:
     entity_id:
-      description: Names of the WeMo humidifier entities (0 or more entities, if no entity_id is provided, all WeMo humidifiers will have the target humidity set).
+      description: Names of the WeMo humidifier entities (1 or more entity_ids are required).
       example: 'fan.wemo_humidifier'
     target_humidity:
       description: Target humidity. This is a float value between 0 and 100, but will be mapped to the humidity levels that WeMo humidifiers support (45, 50, 55, 60, and 100/Max) by rounding the value down to the nearest supported value.
       example: 56.5
+
+wemo_reset_filter_life:
+  description: Reset the WeMo Humidifier's filter life to 100%.
+  fields:
+    entity_id:
+      description: Names of the WeMo humidifier entities (1 or more entity_ids are required).
+      example: 'fan.wemo_humidifier'
diff --git a/homeassistant/components/fan/wemo.py b/homeassistant/components/fan/wemo.py
index 0c570465f4d..fbf72185ac2 100644
--- a/homeassistant/components/fan/wemo.py
+++ b/homeassistant/components/fan/wemo.py
@@ -78,11 +78,17 @@ HASS_FAN_SPEED_TO_WEMO = {v: k for (k, v) in WEMO_FAN_SPEED_TO_HASS.items()
 SERVICE_SET_HUMIDITY = 'wemo_set_humidity'
 
 SET_HUMIDITY_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
     vol.Required(ATTR_TARGET_HUMIDITY):
         vol.All(vol.Coerce(float), vol.Range(min=0, max=100))
 })
 
+SERVICE_RESET_FILTER_LIFE = 'wemo_reset_filter_life'
+
+RESET_FILTER_LIFE_SCHEMA = vol.Schema({
+    vol.Required(ATTR_ENTITY_ID): cv.entity_ids
+})
+
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up discovered WeMo humidifiers."""
@@ -111,22 +117,29 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     def service_handle(service):
         """Handle the WeMo humidifier services."""
         entity_ids = service.data.get(ATTR_ENTITY_ID)
-        target_humidity = service.data.get(ATTR_TARGET_HUMIDITY)
 
-        if entity_ids:
-            humidifiers = [device for device in hass.data[DATA_KEY].values() if
-                           device.entity_id in entity_ids]
-        else:
-            humidifiers = hass.data[DATA_KEY].values()
+        humidifiers = [device for device in
+                       hass.data[DATA_KEY].values() if
+                       device.entity_id in entity_ids]
 
-        for humidifier in humidifiers:
-            humidifier.set_humidity(target_humidity)
+        if service.service == SERVICE_SET_HUMIDITY:
+            target_humidity = service.data.get(ATTR_TARGET_HUMIDITY)
+
+            for humidifier in humidifiers:
+                humidifier.set_humidity(target_humidity)
+        elif service.service == SERVICE_RESET_FILTER_LIFE:
+            for humidifier in humidifiers:
+                humidifier.reset_filter_life()
 
     # Register service(s)
     hass.services.register(
         DOMAIN, SERVICE_SET_HUMIDITY, service_handle,
         schema=SET_HUMIDITY_SCHEMA)
 
+    hass.services.register(
+        DOMAIN, SERVICE_RESET_FILTER_LIFE, service_handle,
+        schema=RESET_FILTER_LIFE_SCHEMA)
+
 
 class WemoHumidifier(FanEntity):
     """Representation of a WeMo humidifier."""
@@ -137,7 +150,6 @@ class WemoHumidifier(FanEntity):
         self._state = None
         self._available = True
         self._update_lock = None
-
         self._fan_mode = None
         self._target_humidity = None
         self._current_humidity = None
@@ -145,9 +157,6 @@ class WemoHumidifier(FanEntity):
         self._filter_life = None
         self._filter_expired = None
         self._last_fan_on_mode = WEMO_FAN_MEDIUM
-
-        # look up model name, name, and serial number
-        # once as it incurs network traffic
         self._model_name = self.wemo.model_name
         self._name = self.wemo.name
         self._serialnumber = self.wemo.serialnumber
@@ -211,12 +220,12 @@ class WemoHumidifier(FanEntity):
         return WEMO_FAN_SPEED_TO_HASS.get(self._fan_mode)
 
     @property
-    def speed_list(self: FanEntity) -> list:
+    def speed_list(self) -> list:
         """Get the list of available speeds."""
         return SUPPORTED_SPEEDS
 
     @property
-    def supported_features(self: FanEntity) -> int:
+    def supported_features(self) -> int:
         """Flag supported features."""
         return SUPPORTED_FEATURES
 
@@ -276,22 +285,22 @@ class WemoHumidifier(FanEntity):
                             self.name, err)
             self._available = False
 
-    def turn_on(self: FanEntity, speed: str = None, **kwargs) -> None:
+    def turn_on(self, speed: str = None, **kwargs) -> None:
         """Turn the switch on."""
         if speed is None:
             self.wemo.set_state(self._last_fan_on_mode)
         else:
             self.set_speed(speed)
 
-    def turn_off(self: FanEntity, **kwargs) -> None:
+    def turn_off(self, **kwargs) -> None:
         """Turn the switch off."""
         self.wemo.set_state(WEMO_FAN_OFF)
 
-    def set_speed(self: FanEntity, speed: str) -> None:
+    def set_speed(self, speed: str) -> None:
         """Set the fan_mode of the Humidifier."""
         self.wemo.set_state(HASS_FAN_SPEED_TO_WEMO.get(speed))
 
-    def set_humidity(self: FanEntity, humidity: float) -> None:
+    def set_humidity(self, humidity: float) -> None:
         """Set the target humidity level for the Humidifier."""
         if humidity < 50:
             self.wemo.set_humidity(WEMO_HUMIDITY_45)
@@ -303,3 +312,7 @@ class WemoHumidifier(FanEntity):
             self.wemo.set_humidity(WEMO_HUMIDITY_60)
         elif humidity >= 100:
             self.wemo.set_humidity(WEMO_HUMIDITY_100)
+
+    def reset_filter_life(self) -> None:
+        """Reset the filter life to 100%."""
+        self.wemo.reset_filter_life()
diff --git a/homeassistant/components/fan/zha.py b/homeassistant/components/fan/zha.py
index d1731e89894..1649f2e57ca 100644
--- a/homeassistant/components/fan/zha.py
+++ b/homeassistant/components/fan/zha.py
@@ -11,7 +11,7 @@ from homeassistant.components.fan import (
     FanEntity)
 from homeassistant.components.zha import helpers
 from homeassistant.components.zha.const import (
-    DATA_ZHA, DATA_ZHA_DISPATCHERS, ZHA_DISCOVERY_NEW)
+    DATA_ZHA, DATA_ZHA_DISPATCHERS, REPORT_CONFIG_OP, ZHA_DISCOVERY_NEW)
 from homeassistant.components.zha.entities import ZhaEntity
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
@@ -79,6 +79,19 @@ class ZhaFan(ZhaEntity, FanEntity):
     """Representation of a ZHA fan."""
 
     _domain = DOMAIN
+    value_attribute = 0  # fan_mode
+
+    @property
+    def zcl_reporting_config(self) -> dict:
+        """Return a dict of attribute reporting configuration."""
+        return {
+            self.cluster: {self.value_attribute: REPORT_CONFIG_OP}
+        }
+
+    @property
+    def cluster(self):
+        """Fan ZCL Cluster."""
+        return self._endpoint.fan
 
     @property
     def supported_features(self) -> int:
@@ -129,16 +142,17 @@ class ZhaFan(ZhaEntity, FanEntity):
 
     async def async_update(self):
         """Retrieve latest state."""
-        result = await helpers.safe_read(self._endpoint.fan, ['fan_mode'],
+        result = await helpers.safe_read(self.cluster, ['fan_mode'],
                                          allow_cache=False,
                                          only_cache=(not self._initialized))
         new_value = result.get('fan_mode', None)
         self._state = VALUE_TO_SPEED.get(new_value, None)
 
-    @property
-    def should_poll(self) -> bool:
-        """Return True if entity has to be polled for state.
-
-        False if entity pushes its state to HA.
-        """
-        return False
+    def attribute_updated(self, attribute, value):
+        """Handle attribute update from device."""
+        attr_name = self.cluster.attributes.get(attribute, [attribute])[0]
+        _LOGGER.debug("%s: Attribute report '%s'[%s] = %s",
+                      self.entity_id, self.cluster.name, attr_name, value)
+        if attribute == self.value_attribute:
+            self._state = VALUE_TO_SPEED.get(value, self._state)
+            self.async_schedule_update_ha_state()
diff --git a/homeassistant/components/fibaro.py b/homeassistant/components/fibaro.py
index 5813b194890..d506f6c471d 100644
--- a/homeassistant/components/fibaro.py
+++ b/homeassistant/components/fibaro.py
@@ -10,13 +10,14 @@ from collections import defaultdict
 from typing import Optional
 import voluptuous as vol
 
-from homeassistant.const import (ATTR_ARMED, ATTR_BATTERY_LEVEL,
-                                 CONF_PASSWORD, CONF_URL, CONF_USERNAME,
-                                 EVENT_HOMEASSISTANT_STOP)
-import homeassistant.helpers.config_validation as cv
-from homeassistant.util import convert, slugify
+from homeassistant.const import (
+    ATTR_ARMED, ATTR_BATTERY_LEVEL, CONF_DEVICE_CLASS,
+    CONF_EXCLUDE, CONF_ICON, CONF_PASSWORD, CONF_URL, CONF_USERNAME,
+    CONF_WHITE_VALUE, EVENT_HOMEASSISTANT_STOP)
 from homeassistant.helpers import discovery
+import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
+from homeassistant.util import convert, slugify
 
 REQUIREMENTS = ['fiblary3==0.1.7']
 
@@ -27,6 +28,10 @@ FIBARO_CONTROLLER = 'fibaro_controller'
 ATTR_CURRENT_POWER_W = "current_power_w"
 ATTR_CURRENT_ENERGY_KWH = "current_energy_kwh"
 CONF_PLUGINS = "plugins"
+CONF_DIMMING = "dimming"
+CONF_COLOR = "color"
+CONF_RESET_COLOR = "reset_color"
+CONF_DEVICE_CONFIG = "device_config"
 
 FIBARO_COMPONENTS = ['binary_sensor', 'cover', 'light',
                      'scene', 'sensor', 'switch']
@@ -49,12 +54,26 @@ FIBARO_TYPEMAP = {
     'com.fibaro.securitySensor': 'binary_sensor'
 }
 
+DEVICE_CONFIG_SCHEMA_ENTRY = vol.Schema({
+    vol.Optional(CONF_DIMMING): cv.boolean,
+    vol.Optional(CONF_COLOR): cv.boolean,
+    vol.Optional(CONF_WHITE_VALUE): cv.boolean,
+    vol.Optional(CONF_RESET_COLOR): cv.boolean,
+    vol.Optional(CONF_DEVICE_CLASS): cv.string,
+    vol.Optional(CONF_ICON): cv.string,
+})
+
+FIBARO_ID_LIST_SCHEMA = vol.Schema([cv.string])
+
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.Schema({
         vol.Required(CONF_PASSWORD): cv.string,
         vol.Required(CONF_USERNAME): cv.string,
         vol.Required(CONF_URL): cv.url,
         vol.Optional(CONF_PLUGINS, default=False): cv.boolean,
+        vol.Optional(CONF_EXCLUDE, default=[]): FIBARO_ID_LIST_SCHEMA,
+        vol.Optional(CONF_DEVICE_CONFIG, default={}):
+            vol.Schema({cv.string: DEVICE_CONFIG_SCHEMA_ENTRY})
     })
 }, extra=vol.ALLOW_EXTRA)
 
@@ -62,19 +81,20 @@ CONFIG_SCHEMA = vol.Schema({
 class FibaroController():
     """Initiate Fibaro Controller Class."""
 
-    _room_map = None            # Dict for mapping roomId to room object
-    _device_map = None          # Dict for mapping deviceId to device object
-    fibaro_devices = None       # List of devices by type
-    _callbacks = {}             # Dict of update value callbacks by deviceId
-    _client = None              # Fiblary's Client object for communication
-    _state_handler = None       # Fiblary's StateHandler object
-    _import_plugins = None      # Whether to import devices from plugins
-
-    def __init__(self, username, password, url, import_plugins):
+    def __init__(self, username, password, url, import_plugins, config):
         """Initialize the Fibaro controller."""
         from fiblary3.client.v4.client import Client as FibaroClient
         self._client = FibaroClient(url, username, password)
         self._scene_map = None
+        # Whether to import devices from plugins
+        self._import_plugins = import_plugins
+        self._device_config = config[CONF_DEVICE_CONFIG]
+        self._room_map = None         # Mapping roomId to room object
+        self._device_map = None       # Mapping deviceId to device object
+        self.fibaro_devices = None    # List of devices by type
+        self._callbacks = {}          # Update value callbacks by deviceId
+        self._state_handler = None    # Fiblary's StateHandler object
+        self._excluded_devices = config.get(CONF_EXCLUDE, [])
         self.hub_serial = None          # Unique serial number of the hub
 
     def connect(self):
@@ -210,8 +230,11 @@ class FibaroController():
                     slugify(room_name), slugify(device.name), device.id)
                 if device.enabled and \
                         ('isPlugin' not in device or
-                         (not device.isPlugin or self._import_plugins)):
+                         (not device.isPlugin or self._import_plugins)) and \
+                        device.ha_id not in self._excluded_devices:
                     device.mapped_type = self._map_device_to_type(device)
+                    device.device_config = \
+                        self._device_config.get(device.ha_id, {})
                 else:
                     device.mapped_type = None
                 if device.mapped_type:
@@ -233,7 +256,8 @@ def setup(hass, config):
         FibaroController(config[DOMAIN][CONF_USERNAME],
                          config[DOMAIN][CONF_PASSWORD],
                          config[DOMAIN][CONF_URL],
-                         config[DOMAIN][CONF_PLUGINS])
+                         config[DOMAIN][CONF_PLUGINS],
+                         config[DOMAIN])
 
     def stop_fibaro(event):
         """Stop Fibaro Thread."""
diff --git a/homeassistant/components/freebox.py b/homeassistant/components/freebox.py
new file mode 100644
index 00000000000..99efbae0984
--- /dev/null
+++ b/homeassistant/components/freebox.py
@@ -0,0 +1,91 @@
+"""
+Support for Freebox devices (Freebox v6 and Freebox mini 4K).
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/freebox/
+"""
+import logging
+import socket
+
+import voluptuous as vol
+
+from homeassistant.components.discovery import SERVICE_FREEBOX
+from homeassistant.const import CONF_HOST, CONF_PORT, EVENT_HOMEASSISTANT_STOP
+from homeassistant.helpers import config_validation as cv, discovery
+from homeassistant.helpers.discovery import async_load_platform
+
+REQUIREMENTS = ['aiofreepybox==0.0.6']
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = "freebox"
+DATA_FREEBOX = DOMAIN
+
+FREEBOX_CONFIG_FILE = 'freebox.conf'
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_HOST): cv.string,
+        vol.Required(CONF_PORT): cv.port
+    })
+}, extra=vol.ALLOW_EXTRA)
+
+
+async def async_setup(hass, config):
+    """Set up the Freebox component."""
+    conf = config.get(DOMAIN)
+
+    async def discovery_dispatch(service, discovery_info):
+        if conf is None:
+            host = discovery_info.get('properties', {}).get('api_domain')
+            port = discovery_info.get('properties', {}).get('https_port')
+            _LOGGER.info("Discovered Freebox server: %s:%s", host, port)
+            await async_setup_freebox(hass, config, host, port)
+
+    discovery.async_listen(hass, SERVICE_FREEBOX, discovery_dispatch)
+
+    if conf is not None:
+        host = conf.get(CONF_HOST)
+        port = conf.get(CONF_PORT)
+        await async_setup_freebox(hass, config, host, port)
+
+    return True
+
+
+async def async_setup_freebox(hass, config, host, port):
+    """Start up the Freebox component platforms."""
+    from aiofreepybox import Freepybox
+    from aiofreepybox.exceptions import HttpRequestError
+
+    app_desc = {
+        'app_id': 'hass',
+        'app_name': 'Home Assistant',
+        'app_version': '0.65',
+        'device_name': socket.gethostname()
+        }
+
+    token_file = hass.config.path(FREEBOX_CONFIG_FILE)
+    api_version = 'v1'
+
+    fbx = Freepybox(
+        app_desc=app_desc,
+        token_file=token_file,
+        api_version=api_version)
+
+    try:
+        await fbx.open(host, port)
+    except HttpRequestError:
+        _LOGGER.exception('Failed to connect to Freebox')
+    else:
+        hass.data[DATA_FREEBOX] = fbx
+
+        hass.async_create_task(async_load_platform(
+            hass, 'sensor', DOMAIN, {}, config))
+        hass.async_create_task(async_load_platform(
+            hass, 'device_tracker', DOMAIN, {}, config))
+
+        async def close_fbx(event):
+            """Close Freebox connection on HA Stop."""
+            await fbx.close()
+
+        hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, close_fbx)
diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py
index eeb11208dd1..478ff5549d9 100644
--- a/homeassistant/components/frontend/__init__.py
+++ b/homeassistant/components/frontend/__init__.py
@@ -24,7 +24,7 @@ from homeassistant.core import callback
 from homeassistant.helpers.translation import async_get_translations
 from homeassistant.loader import bind_hass
 
-REQUIREMENTS = ['home-assistant-frontend==20181211.2']
+REQUIREMENTS = ['home-assistant-frontend==20190109.0']
 
 DOMAIN = 'frontend'
 DEPENDENCIES = ['api', 'websocket_api', 'http', 'system_log',
@@ -55,8 +55,8 @@ MANIFEST_JSON = {
 
 for size in (192, 384, 512, 1024):
     MANIFEST_JSON['icons'].append({
-        'src': '/static/icons/favicon-{}x{}.png'.format(size, size),
-        'sizes': '{}x{}'.format(size, size),
+        'src': '/static/icons/favicon-{size}x{size}.png'.format(size=size),
+        'sizes': '{size}x{size}'.format(size=size),
         'type': 'image/png'
     })
 
diff --git a/homeassistant/components/google_assistant/__init__.py b/homeassistant/components/google_assistant/__init__.py
index bf0c72ec1c8..c0dff15d888 100644
--- a/homeassistant/components/google_assistant/__init__.py
+++ b/homeassistant/components/google_assistant/__init__.py
@@ -67,7 +67,7 @@ async def async_setup(hass: HomeAssistant, yaml_config: Dict[str, Any]):
         """Handle request sync service calls."""
         websession = async_get_clientsession(hass)
         try:
-            with async_timeout.timeout(5, loop=hass.loop):
+            with async_timeout.timeout(15, loop=hass.loop):
                 agent_user_id = call.data.get('agent_user_id') or \
                                 call.context.user_id
                 res = await websession.post(
diff --git a/homeassistant/components/google_assistant/services.yaml b/homeassistant/components/google_assistant/services.yaml
index 7d3af71ac2b..33a52c8ef60 100644
--- a/homeassistant/components/google_assistant/services.yaml
+++ b/homeassistant/components/google_assistant/services.yaml
@@ -2,4 +2,4 @@ request_sync:
   description: Send a request_sync command to Google.
   fields:
     agent_user_id:
-      description: Optional. Only needed for automations. Specific Home Assistant user id to sync with Google Assistant. Do not need when you call this service through Home Assistant front end or API. Used in automation script or other place where context.user_id is missing.
+      description: "Optional. Only needed for automations. Specific Home Assistant user id (not username, ID in configuration > users > under username) to sync with Google Assistant. Do not need when you call this service through Home Assistant front end or API. Used in automation script or other place where context.user_id is missing."
diff --git a/homeassistant/components/group/__init__.py b/homeassistant/components/group/__init__.py
index 15a3816c559..b6dcd65fc2c 100644
--- a/homeassistant/components/group/__init__.py
+++ b/homeassistant/components/group/__init__.py
@@ -49,7 +49,7 @@ SERVICE_REMOVE = 'remove'
 CONTROL_TYPES = vol.In(['hidden', None])
 
 SET_VISIBILITY_SERVICE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Required(ATTR_VISIBLE): cv.boolean
 })
 
diff --git a/homeassistant/components/homekit/__init__.py b/homeassistant/components/homekit/__init__.py
index da8daf50f2a..c34b527252f 100644
--- a/homeassistant/components/homekit/__init__.py
+++ b/homeassistant/components/homekit/__init__.py
@@ -30,7 +30,7 @@ from .const import (
 from .util import (
     show_setup_message, validate_entity_config, validate_media_player_features)
 
-REQUIREMENTS = ['HAP-python==2.4.1']
+REQUIREMENTS = ['HAP-python==2.4.2']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -245,7 +245,7 @@ class HomeKit():
             return
         self.status = STATUS_WAIT
 
-        # pylint: disable=unused-variable
+        # pylint: disable=unused-import
         from . import (  # noqa F401
             type_covers, type_fans, type_lights, type_locks,
             type_media_players, type_security_systems, type_sensors,
diff --git a/homeassistant/components/homekit/type_fans.py b/homeassistant/components/homekit/type_fans.py
index 5a860ed21c8..2b4e55c4c8d 100644
--- a/homeassistant/components/homekit/type_fans.py
+++ b/homeassistant/components/homekit/type_fans.py
@@ -78,7 +78,7 @@ class Fan(HomeAccessory):
         """Set state if call came from HomeKit."""
         _LOGGER.debug('%s: Set oscillating to %d', self.entity_id, value)
         self._flag[CHAR_SWING_MODE] = True
-        oscillating = True if value == 1 else False
+        oscillating = value == 1
         params = {ATTR_ENTITY_ID: self.entity_id,
                   ATTR_OSCILLATING: oscillating}
         self.call_service(DOMAIN, SERVICE_OSCILLATE, params, oscillating)
diff --git a/homeassistant/components/homekit_controller/__init__.py b/homeassistant/components/homekit_controller/__init__.py
index 45b3442ba9f..09068773e4e 100644
--- a/homeassistant/components/homekit_controller/__init__.py
+++ b/homeassistant/components/homekit_controller/__init__.py
@@ -4,18 +4,16 @@ Support for Homekit device discovery.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/homekit_controller/
 """
-import http
 import json
 import logging
 import os
-import uuid
 
 from homeassistant.components.discovery import SERVICE_HOMEKIT
 from homeassistant.helpers import discovery
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.event import call_later
 
-REQUIREMENTS = ['homekit==0.10']
+REQUIREMENTS = ['homekit==0.12.0']
 
 DOMAIN = 'homekit_controller'
 HOMEKIT_DIR = '.homekit'
@@ -36,43 +34,32 @@ HOMEKIT_IGNORE = [
 
 KNOWN_ACCESSORIES = "{}-accessories".format(DOMAIN)
 KNOWN_DEVICES = "{}-devices".format(DOMAIN)
+CONTROLLER = "{}-controller".format(DOMAIN)
 
 _LOGGER = logging.getLogger(__name__)
 
 REQUEST_TIMEOUT = 5  # seconds
 RETRY_INTERVAL = 60  # seconds
 
+PAIRING_FILE = "pairing.json"
+
 
 class HomeKitConnectionError(ConnectionError):
     """Raised when unable to connect to target device."""
 
 
-def homekit_http_send(self, message_body=None, encode_chunked=False):
-    r"""Send the currently buffered request and clear the buffer.
-
-    Appends an extra \r\n to the buffer.
-    A message_body may be specified, to be appended to the request.
-    """
-    # pylint: disable=protected-access
-    self._buffer.extend((b"", b""))
-    msg = b"\r\n".join(self._buffer)
-    del self._buffer[:]
-
-    if message_body is not None:
-        msg = msg + message_body
-
-    self.send(msg)
-
-
 def get_serial(accessory):
     """Obtain the serial number of a HomeKit device."""
-    import homekit  # pylint: disable=import-error
+    # pylint: disable=import-error
+    from homekit.model.services import ServicesTypes
+    from homekit.model.characteristics import CharacteristicsTypes
+
     for service in accessory['services']:
-        if homekit.ServicesTypes.get_short(service['type']) != \
+        if ServicesTypes.get_short(service['type']) != \
            'accessory-information':
             continue
         for characteristic in service['characteristics']:
-            ctype = homekit.CharacteristicsTypes.get_short(
+            ctype = CharacteristicsTypes.get_short(
                 characteristic['type'])
             if ctype != 'serial-number':
                 continue
@@ -85,10 +72,10 @@ class HKDevice():
 
     def __init__(self, hass, host, port, model, hkid, config_num, config):
         """Initialise a generic HomeKit device."""
-        import homekit  # pylint: disable=import-error
-
         _LOGGER.info("Setting up Homekit device %s", model)
         self.hass = hass
+        self.controller = hass.data[CONTROLLER]
+
         self.host = host
         self.port = port
         self.model = model
@@ -96,50 +83,30 @@ class HKDevice():
         self.config_num = config_num
         self.config = config
         self.configurator = hass.components.configurator
-        self.conn = None
-        self.securecon = None
         self._connection_warning_logged = False
 
-        data_dir = os.path.join(hass.config.path(), HOMEKIT_DIR)
-        if not os.path.isdir(data_dir):
-            os.mkdir(data_dir)
+        self.pairing = self.controller.pairings.get(hkid)
 
-        self.pairing_file = os.path.join(data_dir, 'hk-{}'.format(hkid))
-        self.pairing_data = homekit.load_pairing(self.pairing_file)
-
-        # Monkey patch httpclient for increased compatibility
-        # pylint: disable=protected-access
-        http.client.HTTPConnection._send_output = homekit_http_send
-
-        if self.pairing_data is not None:
+        if self.pairing is not None:
             self.accessory_setup()
         else:
             self.configure()
 
-    def connect(self):
-        """Open the connection to the HomeKit device."""
-        # pylint: disable=import-error
-        import homekit
-
-        self.conn = http.client.HTTPConnection(
-            self.host, port=self.port, timeout=REQUEST_TIMEOUT)
-        if self.pairing_data is not None:
-            controllerkey, accessorykey = \
-                homekit.get_session_keys(self.conn, self.pairing_data)
-            self.securecon = homekit.SecureHttp(
-                self.conn.sock, accessorykey, controllerkey)
-
     def accessory_setup(self):
         """Handle setup of a HomeKit accessory."""
-        import homekit  # pylint: disable=import-error
+        # pylint: disable=import-error
+        from homekit.model.services import ServicesTypes
+
+        self.pairing.pairing_data['AccessoryIP'] = self.host
+        self.pairing.pairing_data['AccessoryPort'] = self.port
 
         try:
-            data = self.get_json('/accessories')
+            data = self.pairing.list_accessories_and_characteristics()
         except HomeKitConnectionError:
             call_later(
                 self.hass, RETRY_INTERVAL, lambda _: self.accessory_setup())
             return
-        for accessory in data['accessories']:
+        for accessory in data:
             serial = get_serial(accessory)
             if serial in self.hass.data[KNOWN_ACCESSORIES]:
                 continue
@@ -149,67 +116,45 @@ class HKDevice():
                 service_info = {'serial': serial,
                                 'aid': aid,
                                 'iid': service['iid']}
-                devtype = homekit.ServicesTypes.get_short(service['type'])
+                devtype = ServicesTypes.get_short(service['type'])
                 _LOGGER.debug("Found %s", devtype)
                 component = HOMEKIT_ACCESSORY_DISPATCH.get(devtype, None)
                 if component is not None:
                     discovery.load_platform(self.hass, component, DOMAIN,
                                             service_info, self.config)
 
-    def get_json(self, target):
-        """Get JSON data from the device."""
-        try:
-            if self.conn is None:
-                self.connect()
-            response = self.securecon.get(target)
-            data = json.loads(response.read().decode())
-
-            # After a successful connection, clear the warning logged status
-            self._connection_warning_logged = False
-
-            return data
-        except (ConnectionError, OSError, json.JSONDecodeError) as ex:
-            # Mark connection as failed
-            if not self._connection_warning_logged:
-                _LOGGER.warning("Failed to connect to homekit device",
-                                exc_info=ex)
-                self._connection_warning_logged = True
-            else:
-                _LOGGER.debug("Failed to connect to homekit device",
-                              exc_info=ex)
-            self.conn = None
-            self.securecon = None
-            raise HomeKitConnectionError() from ex
-
     def device_config_callback(self, callback_data):
         """Handle initial pairing."""
         import homekit  # pylint: disable=import-error
-        pairing_id = str(uuid.uuid4())
         code = callback_data.get('code').strip()
         try:
-            self.connect()
-            self.pairing_data = homekit.perform_pair_setup(self.conn, code,
-                                                           pairing_id)
-        except homekit.exception.UnavailableError:
+            self.controller.perform_pairing(self.hkid, self.hkid, code)
+        except homekit.UnavailableError:
             error_msg = "This accessory is already paired to another device. \
                          Please reset the accessory and try again."
             _configurator = self.hass.data[DOMAIN+self.hkid]
             self.configurator.notify_errors(_configurator, error_msg)
             return
-        except homekit.exception.AuthenticationError:
+        except homekit.AuthenticationError:
             error_msg = "Incorrect HomeKit code for {}. Please check it and \
                          try again.".format(self.model)
             _configurator = self.hass.data[DOMAIN+self.hkid]
             self.configurator.notify_errors(_configurator, error_msg)
             return
-        except homekit.exception.UnknownError:
+        except homekit.UnknownError:
             error_msg = "Received an unknown error. Please file a bug."
             _configurator = self.hass.data[DOMAIN+self.hkid]
             self.configurator.notify_errors(_configurator, error_msg)
             raise
 
-        if self.pairing_data is not None:
-            homekit.save_pairing(self.pairing_file, self.pairing_data)
+        self.pairing = self.controller.pairings.get(self.hkid)
+        if self.pairing is not None:
+            pairing_file = os.path.join(
+                self.hass.config.path(),
+                HOMEKIT_DIR,
+                PAIRING_FILE,
+            )
+            self.controller.save_data(pairing_file)
             _configurator = self.hass.data[DOMAIN+self.hkid]
             self.configurator.request_done(_configurator)
             self.accessory_setup()
@@ -248,10 +193,11 @@ class HomeKitEntity(Entity):
     def update(self):
         """Obtain a HomeKit device's state."""
         try:
-            data = self._accessory.get_json('/accessories')
+            pairing = self._accessory.pairing
+            data = pairing.list_accessories_and_characteristics()
         except HomeKitConnectionError:
             return
-        for accessory in data['accessories']:
+        for accessory in data:
             if accessory['aid'] != self._aid:
                 continue
             for service in accessory['services']:
@@ -273,7 +219,7 @@ class HomeKitEntity(Entity):
     @property
     def available(self) -> bool:
         """Return True if entity is available."""
-        return self._accessory.conn is not None
+        return self._accessory.pairing is not None
 
     def update_characteristics(self, characteristics):
         """Synchronise a HomeKit device state with Home Assistant."""
@@ -281,12 +227,45 @@ class HomeKitEntity(Entity):
 
     def put_characteristics(self, characteristics):
         """Control a HomeKit device state from Home Assistant."""
-        body = json.dumps({'characteristics': characteristics})
-        self._accessory.securecon.put('/characteristics', body)
+        chars = []
+        for row in characteristics:
+            chars.append((
+                row['aid'],
+                row['iid'],
+                row['value'],
+            ))
+
+        self._accessory.pairing.put_characteristics(chars)
 
 
 def setup(hass, config):
     """Set up for Homekit devices."""
+    # pylint: disable=import-error
+    import homekit
+    from homekit.controller import Pairing
+
+    hass.data[CONTROLLER] = controller = homekit.Controller()
+
+    data_dir = os.path.join(hass.config.path(), HOMEKIT_DIR)
+    if not os.path.isdir(data_dir):
+        os.mkdir(data_dir)
+
+    pairing_file = os.path.join(data_dir, PAIRING_FILE)
+    if os.path.exists(pairing_file):
+        controller.load_data(pairing_file)
+
+    # Migrate any existing pairings to the new internal homekit_python format
+    for device in os.listdir(data_dir):
+        if not device.startswith('hk-'):
+            continue
+        alias = device[3:]
+        if alias in controller.pairings:
+            continue
+        with open(os.path.join(data_dir, device)) as pairing_data_fp:
+            pairing_data = json.load(pairing_data_fp)
+        controller.pairings[alias] = Pairing(pairing_data)
+        controller.save_data(pairing_file)
+
     def discovery_dispatch(service, discovery_info):
         """Dispatcher for Homekit discovery events."""
         # model, id
diff --git a/homeassistant/components/homematic/__init__.py b/homeassistant/components/homematic/__init__.py
index ee99e236fa9..e2709bde92a 100644
--- a/homeassistant/components/homematic/__init__.py
+++ b/homeassistant/components/homematic/__init__.py
@@ -19,7 +19,7 @@ from homeassistant.helpers import discovery
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-REQUIREMENTS = ['pyhomematic==0.1.53']
+REQUIREMENTS = ['pyhomematic==0.1.54']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -79,7 +79,7 @@ HM_DEVICE_TYPES = {
         'IPWeatherSensor', 'RotaryHandleSensorIP', 'IPPassageSensor',
         'IPKeySwitchPowermeter', 'IPThermostatWall230V', 'IPWeatherSensorPlus',
         'IPWeatherSensorBasic', 'IPBrightnessSensor', 'IPGarage',
-        'UniversalSensor'],
+        'UniversalSensor', 'MotionIPV2'],
     DISCOVER_CLIMATE: [
         'Thermostat', 'ThermostatWall', 'MAXThermostat', 'ThermostatWall2',
         'MAXWallThermostat', 'IPThermostat', 'IPThermostatWall',
@@ -89,7 +89,7 @@ HM_DEVICE_TYPES = {
         'MotionIP', 'RemoteMotion', 'WeatherSensor', 'TiltSensor',
         'IPShutterContact', 'HMWIOSwitch', 'MaxShutterContact', 'Rain',
         'WiredSensor', 'PresenceIP', 'IPWeatherSensor', 'IPPassageSensor',
-        'SmartwareMotion', 'IPWeatherSensorPlus'],
+        'SmartwareMotion', 'IPWeatherSensorPlus', 'MotionIPV2'],
     DISCOVER_COVER: ['Blind', 'KeyBlind', 'IPKeyBlind', 'IPKeyBlindTilt'],
     DISCOVER_LOCKS: ['KeyMatic']
 }
diff --git a/homeassistant/components/homematicip_cloud/.translations/ca.json b/homeassistant/components/homematicip_cloud/.translations/ca.json
index 9ad495c720a..a1c33a10e93 100644
--- a/homeassistant/components/homematicip_cloud/.translations/ca.json
+++ b/homeassistant/components/homematicip_cloud/.translations/ca.json
@@ -7,9 +7,9 @@
         },
         "error": {
             "invalid_pin": "Codi PIN inv\u00e0lid, torna-ho a provar.",
-            "press_the_button": "Si us plau, premeu el bot\u00f3 blau.",
-            "register_failed": "Error al registrar, torneu-ho a provar.",
-            "timeout_button": "Temps d'espera per pr\u00e9mer el bot\u00f3 blau esgotat, torneu-ho a provar."
+            "press_the_button": "Si us plau, prem el bot\u00f3 blau.",
+            "register_failed": "Error al registrar, torna-ho a provar.",
+            "timeout_button": "El temps d'espera m\u00e0xim per pr\u00e9mer el bot\u00f3 blau s'ha esgotat, torna-ho a provar."
         },
         "step": {
             "init": {
@@ -18,11 +18,11 @@
                     "name": "Nom (opcional, s'utilitza com a nom prefix per a tots els dispositius)",
                     "pin": "Codi PIN (opcional)"
                 },
-                "title": "Trieu el punt d'acc\u00e9s HomematicIP"
+                "title": "Tria el punt d'acc\u00e9s HomematicIP"
             },
             "link": {
-                "description": "Premeu el bot\u00f3 blau del punt d'acc\u00e9s i el bot\u00f3 de enviar per registrar HomematicIP amb Home Assistent. \n\n![Ubicaci\u00f3 del bot\u00f3 al pont](/static/images/config_flows/config_homematicip_cloud.png)",
-                "title": "Enlla\u00e7ar punt d'acc\u00e9s"
+                "description": "Prem el bot\u00f3 blau del punt d'acc\u00e9s i el bot\u00f3 d'enviar per registrar HomematicIP amb Home Assistent. \n\n![Ubicaci\u00f3 del bot\u00f3 al pont](/static/images/config_flows/config_homematicip_cloud.png)",
+                "title": "Enlla\u00e7 amb punt d'acc\u00e9s"
             }
         },
         "title": "HomematicIP Cloud"
diff --git a/homeassistant/components/homematicip_cloud/hap.py b/homeassistant/components/homematicip_cloud/hap.py
index b4605aa37f0..37507a1fca8 100644
--- a/homeassistant/components/homematicip_cloud/hap.py
+++ b/homeassistant/components/homematicip_cloud/hap.py
@@ -96,7 +96,7 @@ class HomematicipHAP:
                 self.config_entry.data.get(HMIPC_NAME)
             )
         except HmipcConnectionError:
-            retry_delay = 2 ** min(tries + 1, 6)
+            retry_delay = 2 ** min(tries, 8)
             _LOGGER.error("Error connecting to HomematicIP with HAP %s. "
                           "Retrying in %d seconds",
                           self.config_entry.data.get(HMIPC_HAPID), retry_delay)
@@ -138,6 +138,8 @@ class HomematicipHAP:
             self._accesspoint_connected = False
             self.set_all_to_unavailable()
         elif not self._accesspoint_connected:
+            # Now the HOME_CHANGED event has fired indicating the access
+            # point has reconnected to the cloud again.
             # Explicitly getting an update as device states might have
             # changed during access point disconnect."""
 
@@ -173,43 +175,30 @@ class HomematicipHAP:
         for device in self.home.devices:
             device.fire_update_event()
 
-    async def _handle_connection(self):
-        """Handle websocket connection."""
-        from homematicip.base.base_connection import HmipConnectionError
-
-        try:
-            await self.home.get_current_state()
-        except HmipConnectionError:
-            return
-        hmip_events = await self.home.enable_events()
-        try:
-            await hmip_events
-        except HmipConnectionError:
-            return
-
     async def async_connect(self):
         """Start WebSocket connection."""
         from homematicip.base.base_connection import HmipConnectionError
 
         tries = 0
         while True:
+            retry_delay = 2 ** min(tries, 8)
+
             try:
                 await self.home.get_current_state()
                 hmip_events = await self.home.enable_events()
                 tries = 0
                 await hmip_events
             except HmipConnectionError:
-                pass
+                _LOGGER.error("Error connecting to HomematicIP with HAP %s. "
+                              "Retrying in %d seconds",
+                              self.config_entry.data.get(HMIPC_HAPID),
+                              retry_delay)
 
             if self._ws_close_requested:
                 break
             self._ws_close_requested = False
-
             tries += 1
-            retry_delay = 2 ** min(tries + 1, 6)
-            _LOGGER.error("Error connecting to HomematicIP with HAP %s. "
-                          "Retrying in %d seconds",
-                          self.config_entry.data.get(HMIPC_HAPID), retry_delay)
+
             try:
                 self._retry_task = self.hass.async_create_task(asyncio.sleep(
                     retry_delay, loop=self.hass.loop))
@@ -224,7 +213,7 @@ class HomematicipHAP:
             self._retry_setup.cancel()
         if self._retry_task is not None:
             self._retry_task.cancel()
-        self.home.disable_events()
+        await self.home.disable_events()
         _LOGGER.info("Closed connection to HomematicIP cloud server")
         for component in COMPONENTS:
             await self.hass.config_entries.async_forward_entry_unload(
diff --git a/homeassistant/components/homeworks.py b/homeassistant/components/homeworks.py
new file mode 100644
index 00000000000..b0510cfe9b5
--- /dev/null
+++ b/homeassistant/components/homeworks.py
@@ -0,0 +1,146 @@
+"""Component for interfacing to Lutron Homeworks Series 4 and 8 systems.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/homeworks/
+"""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.core import callback
+from homeassistant.const import (
+    CONF_HOST, CONF_ID, CONF_NAME, CONF_PORT, EVENT_HOMEASSISTANT_STOP)
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.discovery import load_platform
+from homeassistant.helpers.dispatcher import (
+    dispatcher_send, async_dispatcher_connect)
+from homeassistant.util import slugify
+
+REQUIREMENTS = ['pyhomeworks==0.0.6']
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = 'homeworks'
+
+HOMEWORKS_CONTROLLER = 'homeworks'
+ENTITY_SIGNAL = 'homeworks_entity_{}'
+EVENT_BUTTON_PRESS = 'homeworks_button_press'
+EVENT_BUTTON_RELEASE = 'homeworks_button_release'
+
+CONF_DIMMERS = 'dimmers'
+CONF_KEYPADS = 'keypads'
+CONF_ADDR = 'addr'
+CONF_RATE = 'rate'
+
+FADE_RATE = 1.
+
+CV_FADE_RATE = vol.All(vol.Coerce(float), vol.Range(min=0, max=20))
+
+DIMMER_SCHEMA = vol.Schema({
+    vol.Required(CONF_ADDR): cv.string,
+    vol.Required(CONF_NAME): cv.string,
+    vol.Optional(CONF_RATE, default=FADE_RATE): CV_FADE_RATE
+})
+
+KEYPAD_SCHEMA = vol.Schema({
+    vol.Required(CONF_ADDR): cv.string,
+    vol.Required(CONF_NAME): cv.string,
+})
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_HOST): cv.string,
+        vol.Required(CONF_PORT): cv.port,
+        vol.Required(CONF_DIMMERS): vol.All(cv.ensure_list, [DIMMER_SCHEMA]),
+        vol.Optional(CONF_KEYPADS, default=[]): vol.All(cv.ensure_list,
+                                                        [KEYPAD_SCHEMA]),
+    }),
+}, extra=vol.ALLOW_EXTRA)
+
+
+def setup(hass, base_config):
+    """Start Homeworks controller."""
+    from pyhomeworks.pyhomeworks import Homeworks
+
+    def hw_callback(msg_type, values):
+        """Dispatch state changes."""
+        _LOGGER.debug('callback: %s, %s', msg_type, values)
+        addr = values[0]
+        signal = ENTITY_SIGNAL.format(addr)
+        dispatcher_send(hass, signal, msg_type, values)
+
+    config = base_config.get(DOMAIN)
+    controller = Homeworks(config[CONF_HOST], config[CONF_PORT], hw_callback)
+    hass.data[HOMEWORKS_CONTROLLER] = controller
+
+    def cleanup(event):
+        controller.close()
+
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, cleanup)
+
+    dimmers = config[CONF_DIMMERS]
+    load_platform(hass, 'light', DOMAIN, {CONF_DIMMERS: dimmers}, base_config)
+
+    for key_config in config[CONF_KEYPADS]:
+        addr = key_config[CONF_ADDR]
+        name = key_config[CONF_NAME]
+        HomeworksKeypadEvent(hass, addr, name)
+
+    return True
+
+
+class HomeworksDevice():
+    """Base class of a Homeworks device."""
+
+    def __init__(self, controller, addr, name):
+        """Controller, address, and name of the device."""
+        self._addr = addr
+        self._name = name
+        self._controller = controller
+
+    @property
+    def unique_id(self):
+        """Return a unique identifier."""
+        return 'homeworks.{}'.format(self._addr)
+
+    @property
+    def name(self):
+        """Device name."""
+        return self._name
+
+    @property
+    def should_poll(self):
+        """No need to poll."""
+        return False
+
+
+class HomeworksKeypadEvent:
+    """When you want signals instead of entities.
+
+    Stateless sensors such as keypads are expected to generate an event
+    instead of a sensor entity in hass.
+    """
+
+    def __init__(self, hass, addr, name):
+        """Register callback that will be used for signals."""
+        self._hass = hass
+        self._addr = addr
+        self._name = name
+        self._id = slugify(self._name)
+        signal = ENTITY_SIGNAL.format(self._addr)
+        async_dispatcher_connect(
+            self._hass, signal, self._update_callback)
+
+    @callback
+    def _update_callback(self, msg_type, values):
+        """Fire events if button is pressed or released."""
+        from pyhomeworks.pyhomeworks import (
+            HW_BUTTON_PRESSED, HW_BUTTON_RELEASED)
+        if msg_type == HW_BUTTON_PRESSED:
+            event = EVENT_BUTTON_PRESS
+        elif msg_type == HW_BUTTON_RELEASED:
+            event = EVENT_BUTTON_RELEASE
+        else:
+            return
+        data = {CONF_ID: self._id, CONF_NAME: self._name, 'button': values[1]}
+        self._hass.bus.async_fire(event, data)
diff --git a/homeassistant/components/huawei_lte.py b/homeassistant/components/huawei_lte.py
index e8d3bc8b3a1..1f35f86ccb2 100644
--- a/homeassistant/components/huawei_lte.py
+++ b/homeassistant/components/huawei_lte.py
@@ -22,9 +22,10 @@ from homeassistant.util import Throttle
 _LOGGER = logging.getLogger(__name__)
 
 # dicttoxml (used by huawei-lte-api) has uselessly verbose INFO level.
+# https://github.com/quandyfactory/dicttoxml/issues/60
 logging.getLogger('dicttoxml').setLevel(logging.WARNING)
 
-REQUIREMENTS = ['huawei-lte-api==1.0.16']
+REQUIREMENTS = ['huawei-lte-api==1.1.1']
 
 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=10)
 
@@ -50,6 +51,14 @@ class RouterData:
     traffic_statistics = attr.ib(init=False, factory=dict)
     wlan_host_list = attr.ib(init=False, factory=dict)
 
+    _subscriptions = attr.ib(init=False, factory=set)
+
+    def __attrs_post_init__(self) -> None:
+        """Fetch device information once, for serial number in @unique_ids."""
+        self.subscribe("device_information")
+        self._update()
+        self.unsubscribe("device_information")
+
     def __getitem__(self, path: str):
         """
         Get value corresponding to a dotted path.
@@ -65,17 +74,34 @@ class RouterData:
             raise KeyError from err
         return reduce(operator.getitem, rest, data)
 
+    def subscribe(self, path: str) -> None:
+        """Subscribe to given router data entries."""
+        self._subscriptions.add(path.split(".")[0])
+
+    def unsubscribe(self, path: str) -> None:
+        """Unsubscribe from given router data entries."""
+        self._subscriptions.discard(path.split(".")[0])
+
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     def update(self) -> None:
         """Call API to update data."""
-        self.device_information = self.client.device.information()
-        _LOGGER.debug("device_information=%s", self.device_information)
-        self.device_signal = self.client.device.signal()
-        _LOGGER.debug("device_signal=%s", self.device_signal)
-        self.traffic_statistics = self.client.monitoring.traffic_statistics()
-        _LOGGER.debug("traffic_statistics=%s", self.traffic_statistics)
-        self.wlan_host_list = self.client.wlan.host_list()
-        _LOGGER.debug("wlan_host_list=%s", self.wlan_host_list)
+        self._update()
+
+    def _update(self) -> None:
+        debugging = _LOGGER.isEnabledFor(logging.DEBUG)
+        if debugging or "device_information" in self._subscriptions:
+            self.device_information = self.client.device.information()
+            _LOGGER.debug("device_information=%s", self.device_information)
+        if debugging or "device_signal" in self._subscriptions:
+            self.device_signal = self.client.device.signal()
+            _LOGGER.debug("device_signal=%s", self.device_signal)
+        if debugging or "traffic_statistics" in self._subscriptions:
+            self.traffic_statistics = \
+                self.client.monitoring.traffic_statistics()
+            _LOGGER.debug("traffic_statistics=%s", self.traffic_statistics)
+        if debugging or "wlan_host_list" in self._subscriptions:
+            self.wlan_host_list = self.client.wlan.host_list()
+            _LOGGER.debug("wlan_host_list=%s", self.wlan_host_list)
 
 
 @attr.s
@@ -120,7 +146,6 @@ def _setup_lte(hass, lte_config) -> None:
     client = Client(connection)
 
     data = RouterData(client)
-    data.update()
     hass.data[DATA_KEY].data[url] = data
 
     def cleanup(event):
diff --git a/homeassistant/components/hue/.translations/ca.json b/homeassistant/components/hue/.translations/ca.json
index 6c41eed5467..a37d4ef1518 100644
--- a/homeassistant/components/hue/.translations/ca.json
+++ b/homeassistant/components/hue/.translations/ca.json
@@ -3,24 +3,24 @@
         "abort": {
             "all_configured": "Tots els enlla\u00e7os Philips Hue ja estan configurats",
             "already_configured": "L'enlla\u00e7 ja est\u00e0 configurat",
-            "cannot_connect": "No es pot connectar amb l'enlla\u00e7",
+            "cannot_connect": "No s'ha pogut connectar amb l'enlla\u00e7",
             "discover_timeout": "No s'han pogut descobrir enlla\u00e7os Hue",
             "no_bridges": "No s'han trobat enlla\u00e7os Philips Hue",
             "unknown": "S'ha produ\u00eft un error desconegut"
         },
         "error": {
             "linking": "S'ha produ\u00eft un error desconegut al vincular.",
-            "register_failed": "No s'ha pogut registrar, torneu-ho a provar"
+            "register_failed": "No s'ha pogut registrar, torna-ho a provar"
         },
         "step": {
             "init": {
                 "data": {
                     "host": "Amfitri\u00f3"
                 },
-                "title": "Tria l'enlla\u00e7 Hue"
+                "title": "Tria de l'enlla\u00e7 Hue"
             },
             "link": {
-                "description": "Premeu el bot\u00f3 de l'ella\u00e7 per registrar Philips Hue amb Home Assistant. \n\n ![Ubicaci\u00f3 del bot\u00f3 al pont](/static/images/config_philips_hue.jpg)",
+                "description": "Prem el bot\u00f3 de l'enlla\u00e7 per registrar Philips Hue amb Home Assistant. \n\n ![Ubicaci\u00f3 del bot\u00f3 al pont](/static/images/config_philips_hue.jpg)",
                 "title": "Vincular concentrador"
             }
         },
diff --git a/homeassistant/components/hue/.translations/hu.json b/homeassistant/components/hue/.translations/hu.json
index be6548f59a0..4d534eace7d 100644
--- a/homeassistant/components/hue/.translations/hu.json
+++ b/homeassistant/components/hue/.translations/hu.json
@@ -24,6 +24,6 @@
                 "title": "Kapcsol\u00f3d\u00e1s a hubhoz"
             }
         },
-        "title": "Philips Hue Bridge"
+        "title": "Philips Hue"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/hue/.translations/lb.json b/homeassistant/components/hue/.translations/lb.json
index c4ad10da278..9b245a2a875 100644
--- a/homeassistant/components/hue/.translations/lb.json
+++ b/homeassistant/components/hue/.translations/lb.json
@@ -24,6 +24,6 @@
                 "title": "Link Hub"
             }
         },
-        "title": "Philips Hue Bridge"
+        "title": "Philips Hue"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/idteck_prox.py b/homeassistant/components/idteck_prox.py
new file mode 100644
index 00000000000..90c07c487b6
--- /dev/null
+++ b/homeassistant/components/idteck_prox.py
@@ -0,0 +1,75 @@
+"""Component for interfacing RFK101 proximity card readers.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/idteck_prox/
+"""
+import logging
+
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.const import (
+    CONF_HOST, CONF_PORT, CONF_NAME, EVENT_HOMEASSISTANT_STOP)
+
+REQUIREMENTS = ['rfk101py==0.0.1']
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = "idteck_prox"
+
+EVENT_IDTECK_PROX_KEYCARD = 'idteck_prox_keycard'
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.All(cv.ensure_list, [vol.Schema({
+        vol.Required(CONF_HOST): cv.string,
+        vol.Required(CONF_PORT): cv.port,
+        vol.Required(CONF_NAME): cv.string,
+    })])
+}, extra=vol.ALLOW_EXTRA)
+
+
+def setup(hass, config):
+    """Set up the IDTECK proximity card component."""
+    conf = config[DOMAIN]
+    for unit in conf:
+        host = unit[CONF_HOST]
+        port = unit[CONF_PORT]
+        name = unit[CONF_NAME]
+
+        try:
+            reader = IdteckReader(hass, host, port, name)
+            reader.connect()
+            hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, reader.stop)
+        except OSError as error:
+            _LOGGER.error('Error creating "%s". %s', name, error)
+            return False
+
+    return True
+
+
+class IdteckReader():
+    """Representation of an IDTECK proximity card reader."""
+
+    def __init__(self, hass, host, port, name):
+        """Initialize the reader."""
+        self.hass = hass
+        self._host = host
+        self._port = port
+        self._name = name
+        self._connection = None
+
+    def connect(self):
+        """Connect to the reader."""
+        from rfk101py.rfk101py import rfk101py
+        self._connection = rfk101py(self._host, self._port, self._callback)
+
+    def _callback(self, card):
+        """Send a keycard event message into HASS whenever a card is read."""
+        self.hass.bus.fire(
+            EVENT_IDTECK_PROX_KEYCARD, {'card': card, 'name': self._name})
+
+    def stop(self):
+        """Close resources."""
+        if self._connection:
+            self._connection.close()
+            self._connection = None
diff --git a/homeassistant/components/ifttt/.translations/ca.json b/homeassistant/components/ifttt/.translations/ca.json
index aadd66902b6..597328a2ee4 100644
--- a/homeassistant/components/ifttt/.translations/ca.json
+++ b/homeassistant/components/ifttt/.translations/ca.json
@@ -1,16 +1,16 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "La vostra inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de IFTTT.",
+            "not_internet_accessible": "La inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de IFTTT.",
             "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
         },
         "create_entry": {
-            "default": "Per enviar esdeveniments a Home Assistant, necessitareu utilitzar l'acci\u00f3 \"Make a web resquest\" de [IFTTT Webhook applet]({applet_url}). \n\n Ompliu la informaci\u00f3 seg\u00fcent: \n\n - URL: `{webhook_url}` \n - Method: POST \n - Content Type: application/json \n\nVegeu [la documentaci\u00f3]({docs_url}) sobre com configurar els automatismes per gestionar les dades entrants."
+            "default": "Per enviar esdeveniments a Home Assistant, necessitar\u00e0s utilitzar l'acci\u00f3 \"Make a web resquest\" de [IFTTT Webhook applet]({applet_url}). \n\nCompleta la seg\u00fcent informaci\u00f3: \n\n- URL: `{webhook_url}` \n- Method: POST \n- Content Type: application/json \n\nConsulta la [documentaci\u00f3]({docs_url}) sobre com configurar els automatismes per gestionar dades entrants."
         },
         "step": {
             "user": {
-                "description": "Esteu segur que voleu configurar IFTTT?",
-                "title": "Configureu la miniaplicaci\u00f3 Webhook de IFTTT"
+                "description": "Est\u00e0s segur que vols configurar IFTTT?",
+                "title": "Configuraci\u00f3 de la miniaplicaci\u00f3 Webhook de IFTTT"
             }
         },
         "title": "IFTTT"
diff --git a/homeassistant/components/ifttt/.translations/hu.json b/homeassistant/components/ifttt/.translations/hu.json
index 6ecf654ff47..3c4ec66e9a3 100644
--- a/homeassistant/components/ifttt/.translations/hu.json
+++ b/homeassistant/components/ifttt/.translations/hu.json
@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "A Home Assistant-nek el\u00e9rhet\u0151nek kell lennie az internetr\u0151l az IFTTT \u00fczenetek fogad\u00e1s\u00e1hoz."
+            "not_internet_accessible": "A Home Assistant-nek el\u00e9rhet\u0151nek kell lennie az internetr\u0151l az IFTTT \u00fczenetek fogad\u00e1s\u00e1hoz.",
+            "one_instance_allowed": "Csak egyetlen konfigur\u00e1ci\u00f3 sz\u00fcks\u00e9ges."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/ihc/__init__.py b/homeassistant/components/ihc/__init__.py
index 16c51c00767..b081f117919 100644
--- a/homeassistant/components/ihc/__init__.py
+++ b/homeassistant/components/ihc/__init__.py
@@ -6,11 +6,10 @@ https://home-assistant.io/components/ihc/
 """
 import logging
 import os.path
-import xml.etree.ElementTree
 
 import voluptuous as vol
-from homeassistant.components.binary_sensor import (
-    DEVICE_CLASSES_SCHEMA)
+
+from homeassistant.components.binary_sensor import DEVICE_CLASSES_SCHEMA
 from homeassistant.components.ihc.const import (
     ATTR_IHC_ID, ATTR_VALUE, CONF_AUTOSETUP, CONF_BINARY_SENSOR, CONF_DIMMABLE,
     CONF_INFO, CONF_INVERTING, CONF_LIGHT, CONF_NODE, CONF_NOTE, CONF_POSITION,
@@ -18,24 +17,28 @@ from homeassistant.components.ihc.const import (
     SERVICE_SET_RUNTIME_VALUE_FLOAT, SERVICE_SET_RUNTIME_VALUE_INT)
 from homeassistant.config import load_yaml_config_file
 from homeassistant.const import (
-    CONF_ID, CONF_NAME, CONF_PASSWORD,
-    CONF_TYPE, CONF_UNIT_OF_MEASUREMENT, CONF_URL,
-    CONF_USERNAME, TEMP_CELSIUS)
+    CONF_ID, CONF_NAME, CONF_PASSWORD, CONF_TYPE, CONF_UNIT_OF_MEASUREMENT,
+    CONF_URL, CONF_USERNAME, TEMP_CELSIUS)
 from homeassistant.helpers import discovery
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import HomeAssistantType
 
-REQUIREMENTS = ['ihcsdk==2.2.0']
+REQUIREMENTS = ['ihcsdk==2.2.0', 'defusedxml==0.5.0']
+
+_LOGGER = logging.getLogger(__name__)
+
+AUTO_SETUP_YAML = 'ihc_auto_setup.yaml'
 
 DOMAIN = 'ihc'
-IHC_DATA = 'ihc{}'
+
 IHC_CONTROLLER = 'controller'
+IHC_DATA = 'ihc{}'
 IHC_INFO = 'info'
-AUTO_SETUP_YAML = 'ihc_auto_setup.yaml'
+IHC_PLATFORMS = ('binary_sensor', 'light', 'sensor', 'switch')
 
 
 def validate_name(config):
-    """Validate device name."""
+    """Validate the device name."""
     if CONF_NAME in config:
         return config
     ihcid = config[CONF_ID]
@@ -47,17 +50,16 @@ def validate_name(config):
 DEVICE_SCHEMA = vol.Schema({
     vol.Required(CONF_ID): cv.positive_int,
     vol.Optional(CONF_NAME): cv.string,
+    vol.Optional(CONF_NOTE): cv.string,
     vol.Optional(CONF_POSITION): cv.string,
-    vol.Optional(CONF_NOTE): cv.string
 })
 
 
-SWITCH_SCHEMA = DEVICE_SCHEMA.extend({
-})
+SWITCH_SCHEMA = DEVICE_SCHEMA.extend({})
 
 BINARY_SENSOR_SCHEMA = DEVICE_SCHEMA.extend({
-    vol.Optional(CONF_TYPE): DEVICE_CLASSES_SCHEMA,
     vol.Optional(CONF_INVERTING, default=False): cv.boolean,
+    vol.Optional(CONF_TYPE): DEVICE_CLASSES_SCHEMA,
 })
 
 LIGHT_SCHEMA = DEVICE_SCHEMA.extend({
@@ -65,47 +67,28 @@ LIGHT_SCHEMA = DEVICE_SCHEMA.extend({
 })
 
 SENSOR_SCHEMA = DEVICE_SCHEMA.extend({
-    vol.Optional(CONF_UNIT_OF_MEASUREMENT,
-                 default=TEMP_CELSIUS): cv.string,
+    vol.Optional(CONF_UNIT_OF_MEASUREMENT, default=TEMP_CELSIUS): cv.string,
 })
 
 IHC_SCHEMA = vol.Schema({
+    vol.Required(CONF_PASSWORD): cv.string,
     vol.Required(CONF_URL): cv.string,
     vol.Required(CONF_USERNAME): cv.string,
-    vol.Required(CONF_PASSWORD): cv.string,
     vol.Optional(CONF_AUTOSETUP, default=True): cv.boolean,
-    vol.Optional(CONF_INFO, default=True): cv.boolean,
     vol.Optional(CONF_BINARY_SENSOR, default=[]):
-        vol.All(cv.ensure_list, [
-            vol.All(
-                BINARY_SENSOR_SCHEMA,
-                validate_name)
-        ]),
+        vol.All(
+            cv.ensure_list, [vol.All(BINARY_SENSOR_SCHEMA, validate_name)]),
+    vol.Optional(CONF_INFO, default=True): cv.boolean,
     vol.Optional(CONF_LIGHT, default=[]):
-        vol.All(cv.ensure_list, [
-            vol.All(
-                LIGHT_SCHEMA,
-                validate_name)
-        ]),
+        vol.All(cv.ensure_list, [vol.All(LIGHT_SCHEMA, validate_name)]),
     vol.Optional(CONF_SENSOR, default=[]):
-        vol.All(cv.ensure_list, [
-            vol.All(
-                SENSOR_SCHEMA,
-                validate_name)
-        ]),
+        vol.All(cv.ensure_list, [vol.All(SENSOR_SCHEMA, validate_name)]),
     vol.Optional(CONF_SWITCH, default=[]):
-        vol.All(cv.ensure_list, [
-            vol.All(
-                SWITCH_SCHEMA,
-                validate_name)
-        ]),
+        vol.All(cv.ensure_list, [vol.All(SWITCH_SCHEMA, validate_name)]),
 })
 
 CONFIG_SCHEMA = vol.Schema({
-    DOMAIN: vol.Schema(vol.All(
-        cv.ensure_list,
-        [IHC_SCHEMA]
-    )),
+    DOMAIN: vol.Schema(vol.All(cv.ensure_list, [IHC_SCHEMA])),
 }, extra=vol.ALLOW_EXTRA)
 
 
@@ -113,25 +96,25 @@ AUTO_SETUP_SCHEMA = vol.Schema({
     vol.Optional(CONF_BINARY_SENSOR, default=[]):
         vol.All(cv.ensure_list, [
             vol.All({
-                vol.Required(CONF_XPATH): cv.string,
                 vol.Required(CONF_NODE): cv.string,
-                vol.Optional(CONF_TYPE): cv.string,
+                vol.Required(CONF_XPATH): cv.string,
                 vol.Optional(CONF_INVERTING, default=False): cv.boolean,
+                vol.Optional(CONF_TYPE): cv.string,
             })
         ]),
     vol.Optional(CONF_LIGHT, default=[]):
         vol.All(cv.ensure_list, [
             vol.All({
-                vol.Required(CONF_XPATH): cv.string,
                 vol.Required(CONF_NODE): cv.string,
+                vol.Required(CONF_XPATH): cv.string,
                 vol.Optional(CONF_DIMMABLE, default=False): cv.boolean,
             })
         ]),
     vol.Optional(CONF_SENSOR, default=[]):
         vol.All(cv.ensure_list, [
             vol.All({
-                vol.Required(CONF_XPATH): cv.string,
                 vol.Required(CONF_NODE): cv.string,
+                vol.Required(CONF_XPATH): cv.string,
                 vol.Optional(CONF_UNIT_OF_MEASUREMENT,
                              default=TEMP_CELSIUS): cv.string,
             })
@@ -139,31 +122,27 @@ AUTO_SETUP_SCHEMA = vol.Schema({
     vol.Optional(CONF_SWITCH, default=[]):
         vol.All(cv.ensure_list, [
             vol.All({
-                vol.Required(CONF_XPATH): cv.string,
                 vol.Required(CONF_NODE): cv.string,
+                vol.Required(CONF_XPATH): cv.string,
             })
         ]),
 })
 
 SET_RUNTIME_VALUE_BOOL_SCHEMA = vol.Schema({
     vol.Required(ATTR_IHC_ID): cv.positive_int,
-    vol.Required(ATTR_VALUE): cv.boolean
+    vol.Required(ATTR_VALUE): cv.boolean,
 })
 
 SET_RUNTIME_VALUE_INT_SCHEMA = vol.Schema({
     vol.Required(ATTR_IHC_ID): cv.positive_int,
-    vol.Required(ATTR_VALUE): int
+    vol.Required(ATTR_VALUE): int,
 })
 
 SET_RUNTIME_VALUE_FLOAT_SCHEMA = vol.Schema({
     vol.Required(ATTR_IHC_ID): cv.positive_int,
-    vol.Required(ATTR_VALUE): vol.Coerce(float)
+    vol.Required(ATTR_VALUE): vol.Coerce(float),
 })
 
-_LOGGER = logging.getLogger(__name__)
-
-IHC_PLATFORMS = ('binary_sensor', 'light', 'sensor', 'switch')
-
 
 def setup(hass, config):
     """Set up the IHC platform."""
@@ -189,13 +168,13 @@ def ihc_setup(hass, config, conf, controller_id):
         return False
 
     if (conf[CONF_AUTOSETUP] and
-            not autosetup_ihc_products(hass, config, ihc_controller,
-                                       controller_id)):
+            not autosetup_ihc_products(
+                hass, config, ihc_controller, controller_id)):
         return False
     # Manual configuration
-    get_manual_configuration(hass, config, conf, ihc_controller,
-                             controller_id)
-    # Store controler configuration
+    get_manual_configuration(
+        hass, config, conf, ihc_controller, controller_id)
+    # Store controller configuration
     ihc_key = IHC_DATA.format(controller_id)
     hass.data[ihc_key] = {
         IHC_CONTROLLER: ihc_controller,
@@ -204,8 +183,8 @@ def ihc_setup(hass, config, conf, controller_id):
     return True
 
 
-def get_manual_configuration(hass, config, conf, ihc_controller,
-                             controller_id):
+def get_manual_configuration(
+        hass, config, conf, ihc_controller, controller_id):
     """Get manual configuration for IHC devices."""
     for component in IHC_PLATFORMS:
         discovery_info = {}
@@ -230,18 +209,20 @@ def get_manual_configuration(hass, config, conf, ihc_controller,
                 }
                 discovery_info[name] = device
         if discovery_info:
-            discovery.load_platform(hass, component, DOMAIN,
-                                    discovery_info, config)
+            discovery.load_platform(
+                hass, component, DOMAIN, discovery_info, config)
 
 
 def autosetup_ihc_products(hass: HomeAssistantType, config, ihc_controller,
                            controller_id):
     """Auto setup of IHC products from the IHC project file."""
+    from defusedxml import ElementTree
+
     project_xml = ihc_controller.get_project()
     if not project_xml:
         _LOGGER.error("Unable to read project from IHC controller")
         return False
-    project = xml.etree.ElementTree.fromstring(project_xml)
+    project = ElementTree.fromstring(project_xml)
 
     # if an auto setup file exist in the configuration it will override
     yaml_path = hass.config.path(AUTO_SETUP_YAML)
@@ -256,11 +237,11 @@ def autosetup_ihc_products(hass: HomeAssistantType, config, ihc_controller,
     groups = project.findall('.//group')
     for component in IHC_PLATFORMS:
         component_setup = auto_setup_conf[component]
-        discovery_info = get_discovery_info(component_setup, groups,
-                                            controller_id)
+        discovery_info = get_discovery_info(
+            component_setup, groups, controller_id)
         if discovery_info:
-            discovery.load_platform(hass, component, DOMAIN, discovery_info,
-                                    config)
+            discovery.load_platform(
+                hass, component, DOMAIN, discovery_info, config)
     return True
 
 
diff --git a/homeassistant/components/ihc/const.py b/homeassistant/components/ihc/const.py
index d6e4d0e0d4d..69342c944ba 100644
--- a/homeassistant/components/ihc/const.py
+++ b/homeassistant/components/ihc/const.py
@@ -1,22 +1,22 @@
 """IHC component constants."""
 
 CONF_AUTOSETUP = 'auto_setup'
-CONF_INFO = 'info'
-CONF_XPATH = 'xpath'
-CONF_NODE = 'node'
-CONF_INVERTING = 'inverting'
-CONF_DIMMABLE = 'dimmable'
 CONF_BINARY_SENSOR = 'binary_sensor'
+CONF_DIMMABLE = 'dimmable'
+CONF_INFO = 'info'
+CONF_INVERTING = 'inverting'
 CONF_LIGHT = 'light'
+CONF_NAME = 'name'
+CONF_NODE = 'node'
+CONF_NOTE = 'note'
+CONF_POSITION = 'position'
 CONF_SENSOR = 'sensor'
 CONF_SWITCH = 'switch'
-CONF_NAME = 'name'
-CONF_POSITION = 'position'
-CONF_NOTE = 'note'
+CONF_XPATH = 'xpath'
 
 ATTR_IHC_ID = 'ihc_id'
 ATTR_VALUE = 'value'
 
-SERVICE_SET_RUNTIME_VALUE_BOOL = "set_runtime_value_bool"
-SERVICE_SET_RUNTIME_VALUE_INT = "set_runtime_value_int"
-SERVICE_SET_RUNTIME_VALUE_FLOAT = "set_runtime_value_float"
+SERVICE_SET_RUNTIME_VALUE_BOOL = 'set_runtime_value_bool'
+SERVICE_SET_RUNTIME_VALUE_FLOAT = 'set_runtime_value_float'
+SERVICE_SET_RUNTIME_VALUE_INT = 'set_runtime_value_int'
diff --git a/homeassistant/components/ihc/ihcdevice.py b/homeassistant/components/ihc/ihcdevice.py
index 26ee2fb14fc..bef129982b2 100644
--- a/homeassistant/components/ihc/ihcdevice.py
+++ b/homeassistant/components/ihc/ihcdevice.py
@@ -1,5 +1,4 @@
 """Implementation of a base class for all IHC devices."""
-
 from homeassistant.helpers.entity import Entity
 
 
@@ -51,7 +50,7 @@ class IHCDevice(Entity):
             'ihc_id': self.ihc_id,
             'ihc_name': self.ihc_name,
             'ihc_note': self.ihc_note,
-            'ihc_position': self.ihc_position
+            'ihc_position': self.ihc_position,
         }
 
     def on_ihc_change(self, ihc_id, value):
diff --git a/homeassistant/components/ihc/services.yaml b/homeassistant/components/ihc/services.yaml
index a0cc6774fdf..0c63b32a618 100644
--- a/homeassistant/components/ihc/services.yaml
+++ b/homeassistant/components/ihc/services.yaml
@@ -1,26 +1,26 @@
 # Describes the format for available IHC services
 
 set_runtime_value_bool:
-  description: Set a boolean runtime value on the IHC controller
+  description: Set a boolean runtime value on the IHC controller.
   fields:
     ihc_id:
-      description: The integer IHC resource id
+      description: The integer IHC resource ID.
     value:
-      description: The boolean value to set
+      description: The boolean value to set.
 
 set_runtime_value_int:
-  description: Set an integer runtime value on the IHC controller
+  description: Set an integer runtime value on the IHC controller.
   fields:
     ihc_id:
-      description: The integer IHC resource id
+      description: The integer IHC resource ID.
     value:
-      description: The integer value to set
+      description: The integer value to set.
 
 set_runtime_value_float:
-  description: Set a float runtime value on the IHC controller
+  description: Set a float runtime value on the IHC controller.
   fields:
     ihc_id:
-      description: The integer IHC resource id
+      description: The integer IHC resource ID.
     value:
-      description: The float value to set
+      description: The float value to set.
 
diff --git a/homeassistant/components/image_processing/__init__.py b/homeassistant/components/image_processing/__init__.py
index 72a4a8155e2..b2cbb2b2391 100644
--- a/homeassistant/components/image_processing/__init__.py
+++ b/homeassistant/components/image_processing/__init__.py
@@ -62,7 +62,7 @@ PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
 })
 
 SERVICE_SCAN_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
 })
 
 
diff --git a/homeassistant/components/image_processing/seven_segments.py b/homeassistant/components/image_processing/seven_segments.py
index 1f56ba6b572..a460115cc34 100644
--- a/homeassistant/components/image_processing/seven_segments.py
+++ b/homeassistant/components/image_processing/seven_segments.py
@@ -69,7 +69,9 @@ class ImageProcessingSsocr(ImageProcessingEntity):
                 split_entity_id(camera_entity)[1])
         self._state = None
 
-        self.filepath = os.path.join(self.hass.config.config_dir, 'ocr.png')
+        self.filepath = os.path.join(self.hass.config.config_dir,
+                                     'ssocr-{0}.png'.format(
+                                         self._name.replace(' ', '_')))
         crop = ['crop', str(config[CONF_X_POS]), str(config[CONF_Y_POS]),
                 str(config[CONF_WIDTH]), str(config[CONF_HEIGHT])]
         digits = ['-d', str(config.get(CONF_DIGITS, -1))]
diff --git a/homeassistant/components/insteon/__init__.py b/homeassistant/components/insteon/__init__.py
index 14d43cbcaee..e82e47dc5f4 100644
--- a/homeassistant/components/insteon/__init__.py
+++ b/homeassistant/components/insteon/__init__.py
@@ -10,16 +10,16 @@ from typing import Dict
 
 import voluptuous as vol
 
-from homeassistant.core import callback
+import homeassistant.helpers.config_validation as cv
 from homeassistant.const import (CONF_PORT, EVENT_HOMEASSISTANT_STOP,
                                  CONF_PLATFORM,
                                  CONF_ENTITY_ID,
                                  CONF_HOST)
-import homeassistant.helpers.config_validation as cv
+from homeassistant.core import callback
 from homeassistant.helpers import discovery
 from homeassistant.helpers.entity import Entity
 
-REQUIREMENTS = ['insteonplm==0.15.1']
+REQUIREMENTS = ['insteonplm==0.15.2']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -91,7 +91,7 @@ CONF_DEVICE_OVERRIDE_SCHEMA = vol.All(
         vol.Optional(CONF_FIRMWARE): cv.byte,
         vol.Optional(CONF_PRODUCT_KEY): cv.byte,
         vol.Optional(CONF_PLATFORM): cv.string,
-        }))
+    }))
 
 CONF_X10_SCHEMA = vol.All(
     vol.Schema({
@@ -147,6 +147,45 @@ X10_HOUSECODE_SCHEMA = vol.Schema({
     vol.Required(SRV_HOUSECODE): vol.In(HOUSECODES),
     })
 
+STATE_NAME_LABEL_MAP = {
+    'keypadButtonA': 'Button A',
+    'keypadButtonB': 'Button B',
+    'keypadButtonC': 'Button C',
+    'keypadButtonD': 'Button D',
+    'keypadButtonE': 'Button E',
+    'keypadButtonF': 'Button F',
+    'keypadButtonG': 'Button G',
+    'keypadButtonH': 'Button H',
+    'keypadButtonMain': 'Main',
+    'onOffButtonA': 'Button A',
+    'onOffButtonB': 'Button B',
+    'onOffButtonC': 'Button C',
+    'onOffButtonD': 'Button D',
+    'onOffButtonE': 'Button E',
+    'onOffButtonF': 'Button F',
+    'onOffButtonG': 'Button G',
+    'onOffButtonH': 'Button H',
+    'onOffButtonMain': 'Main',
+    'fanOnLevel': 'Fan',
+    'lightOnLevel': 'Light',
+    'coolSetPoint': 'Cool Set',
+    'heatSetPoint': 'HeatSet',
+    'statusReport': 'Status',
+    'generalSensor': 'Sensor',
+    'motionSensor': 'Motion',
+    'lightSensor': 'Light',
+    'batterySensor': 'Battery',
+    'dryLeakSensor': 'Dry',
+    'wetLeakSensor': 'Wet',
+    'heartbeatLeakSensor': 'Heartbeat',
+    'openClosedRelay': 'Relay',
+    'openClosedSensor': 'Sensor',
+    'lightOnOff': 'Light',
+    'outletTopOnOff': 'Top',
+    'outletBottomOnOff': 'Bottom',
+    'coverOpenLevel': 'Cover',
+}
+
 
 async def async_setup(hass, config):
     """Set up the connection to the modem."""
@@ -478,12 +517,20 @@ class InsteonEntity(Entity):
     @property
     def name(self):
         """Return the name of the node (used for Entity_ID)."""
-        name = ''
-        if self._insteon_device_state.group == 0x01:
-            name = self._insteon_device.id
-        else:
-            name = '{:s}_{:d}'.format(self._insteon_device.id,
-                                      self._insteon_device_state.group)
+        # Set a base description
+        description = self._insteon_device.description
+        if self._insteon_device.description is None:
+            description = 'Unknown Device'
+
+        # Get an extension label if there is one
+        extension = self._get_label()
+        if extension:
+            extension = ' ' + extension
+        name = '{:s} {:s}{:s}'.format(
+            description,
+            self._insteon_device.address.human,
+            extension
+        )
         return name
 
     @property
@@ -526,6 +573,16 @@ class InsteonEntity(Entity):
         """All-Link Database loaded for the device."""
         self.print_aldb()
 
+    def _get_label(self):
+        """Get the device label for grouped devices."""
+        label = ''
+        if len(self._insteon_device.states) > 1:
+            if self._insteon_device_state.name in STATE_NAME_LABEL_MAP:
+                label = STATE_NAME_LABEL_MAP[self._insteon_device_state.name]
+            else:
+                label = 'Group {:d}'.format(self.group)
+        return label
+
 
 def print_aldb_to_log(aldb):
     """Print the All-Link Database to the log file."""
diff --git a/homeassistant/components/ios/.translations/ca.json b/homeassistant/components/ios/.translations/ca.json
index 1b1ed732ab3..dcbffdcebd0 100644
--- a/homeassistant/components/ios/.translations/ca.json
+++ b/homeassistant/components/ios/.translations/ca.json
@@ -5,7 +5,7 @@
         },
         "step": {
             "confirm": {
-                "description": "Voleu configurar el component Home Assistant iOS?",
+                "description": "Vols configurar el component Home Assistant iOS?",
                 "title": "Home Assistant iOS"
             }
         },
diff --git a/homeassistant/components/knx.py b/homeassistant/components/knx.py
index abedc9862c2..366ec4405cd 100644
--- a/homeassistant/components/knx.py
+++ b/homeassistant/components/knx.py
@@ -17,7 +17,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import async_track_state_change
 from homeassistant.helpers.script import Script
 
-REQUIREMENTS = ['xknx==0.9.1']
+REQUIREMENTS = ['xknx==0.9.3']
 
 DOMAIN = "knx"
 DATA_KNX = "data_knx"
diff --git a/homeassistant/components/lcn.py b/homeassistant/components/lcn.py
new file mode 100644
index 00000000000..597acb3bb02
--- /dev/null
+++ b/homeassistant/components/lcn.py
@@ -0,0 +1,199 @@
+"""
+Connects to LCN platform.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/lcn/
+"""
+
+import logging
+import re
+
+import voluptuous as vol
+
+from homeassistant.const import (
+    CONF_ADDRESS, CONF_HOST, CONF_LIGHTS, CONF_NAME, CONF_PASSWORD, CONF_PORT,
+    CONF_USERNAME)
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.discovery import async_load_platform
+from homeassistant.helpers.entity import Entity
+
+REQUIREMENTS = ['pypck==0.5.9']
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = 'lcn'
+DATA_LCN = 'lcn'
+DEFAULT_NAME = 'pchk'
+
+CONF_SK_NUM_TRIES = 'sk_num_tries'
+CONF_DIM_MODE = 'dim_mode'
+CONF_OUTPUT = 'output'
+CONF_TRANSITION = 'transition'
+CONF_DIMMABLE = 'dimmable'
+CONF_CONNECTIONS = 'connections'
+
+DIM_MODES = ['steps50', 'steps200']
+OUTPUT_PORTS = ['output1', 'output2', 'output3', 'output4']
+
+# Regex for address validation
+PATTERN_ADDRESS = re.compile('^((?P<conn_id>\\w+)\\.)?s?(?P<seg_id>\\d+)'
+                             '\\.(?P<type>m|g)?(?P<id>\\d+)$')
+
+
+def has_unique_connection_names(connections):
+    """Validate that all connection names are unique.
+
+    Use 'pchk' as default connection_name (or add a numeric suffix if
+    pchk' is already in use.
+    """
+    for suffix, connection in enumerate(connections):
+        connection_name = connection.get(CONF_NAME)
+        if connection_name is None:
+            if suffix == 0:
+                connection[CONF_NAME] = DEFAULT_NAME
+            else:
+                connection[CONF_NAME] = '{}{:d}'.format(DEFAULT_NAME, suffix)
+
+    schema = vol.Schema(vol.Unique())
+    schema([connection.get(CONF_NAME) for connection in connections])
+    return connections
+
+
+def is_address(value):
+    """Validate the given address string.
+
+    Examples for S000M005 at myhome:
+        myhome.s000.m005
+        myhome.s0.m5
+        myhome.0.5    ("m" is implicit if missing)
+
+    Examples for s000g011
+        myhome.0.g11
+        myhome.s0.g11
+    """
+    matcher = PATTERN_ADDRESS.match(value)
+    if matcher:
+        is_group = (matcher.group('type') == 'g')
+        addr = (int(matcher.group('seg_id')),
+                int(matcher.group('id')),
+                is_group)
+        conn_id = matcher.group('conn_id')
+        return addr, conn_id
+    raise vol.error.Invalid('Not a valid address string.')
+
+
+LIGHTS_SCHEMA = vol.Schema({
+    vol.Required(CONF_NAME): cv.string,
+    vol.Required(CONF_ADDRESS): is_address,
+    vol.Required(CONF_OUTPUT): vol.All(vol.In(OUTPUT_PORTS), vol.Upper),
+    vol.Optional(CONF_DIMMABLE, default=False): vol.Coerce(bool),
+    vol.Optional(CONF_TRANSITION, default=0):
+        vol.All(vol.Coerce(float), vol.Range(min=0., max=486.),
+                lambda value: value * 1000),
+})
+
+CONNECTION_SCHEMA = vol.Schema({
+    vol.Required(CONF_HOST): cv.string,
+    vol.Required(CONF_PORT): cv.port,
+    vol.Required(CONF_USERNAME): cv.string,
+    vol.Required(CONF_PASSWORD): cv.string,
+    vol.Optional(CONF_SK_NUM_TRIES, default=3): cv.positive_int,
+    vol.Optional(CONF_DIM_MODE, default='steps50'): vol.All(vol.In(DIM_MODES),
+                                                            vol.Upper),
+    vol.Optional(CONF_NAME): cv.string
+})
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_CONNECTIONS): vol.All(
+            cv.ensure_list, has_unique_connection_names, [CONNECTION_SCHEMA]),
+        vol.Required(CONF_LIGHTS): vol.All(cv.ensure_list, [LIGHTS_SCHEMA])
+    })
+}, extra=vol.ALLOW_EXTRA)
+
+
+def get_connection(connections, connection_id=None):
+    """Return the connection object from list."""
+    if connection_id is None:
+        connection = connections[0]
+    else:
+        for connection in connections:
+            if connection.connection_id == connection_id:
+                break
+        else:
+            raise ValueError('Unknown connection_id.')
+    return connection
+
+
+async def async_setup(hass, config):
+    """Set up the LCN component."""
+    import pypck
+    from pypck.connection import PchkConnectionManager
+
+    hass.data[DATA_LCN] = {}
+
+    conf_connections = config[DOMAIN][CONF_CONNECTIONS]
+    connections = []
+    for conf_connection in conf_connections:
+        connection_name = conf_connection.get(CONF_NAME)
+
+        settings = {'SK_NUM_TRIES': conf_connection[CONF_SK_NUM_TRIES],
+                    'DIM_MODE': pypck.lcn_defs.OutputPortDimMode[
+                        conf_connection[CONF_DIM_MODE]]}
+
+        connection = PchkConnectionManager(hass.loop,
+                                           conf_connection[CONF_HOST],
+                                           conf_connection[CONF_PORT],
+                                           conf_connection[CONF_USERNAME],
+                                           conf_connection[CONF_PASSWORD],
+                                           settings=settings,
+                                           connection_id=connection_name)
+
+        try:
+            # establish connection to PCHK server
+            await hass.async_create_task(connection.async_connect(timeout=15))
+            connections.append(connection)
+            _LOGGER.info('LCN connected to "%s"', connection_name)
+        except TimeoutError:
+            _LOGGER.error('Connection to PCHK server "%s" failed.',
+                          connection_name)
+            return False
+
+    hass.data[DATA_LCN][CONF_CONNECTIONS] = connections
+
+    hass.async_create_task(
+        async_load_platform(hass, 'light', DOMAIN,
+                            config[DOMAIN][CONF_LIGHTS], config))
+
+    return True
+
+
+class LcnDevice(Entity):
+    """Parent class for all devices associated with the LCN component."""
+
+    def __init__(self, config, address_connection):
+        """Initialize the LCN device."""
+        import pypck
+        self.pypck = pypck
+        self.config = config
+        self.address_connection = address_connection
+        self._name = config[CONF_NAME]
+
+    @property
+    def should_poll(self) -> bool:
+        """Lcn device entity pushes its state to HA."""
+        return False
+
+    async def async_added_to_hass(self) -> None:
+        """Run when entity about to be added to hass."""
+        self.address_connection.register_for_inputs(
+            self.input_received)
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    def input_received(self, input_obj):
+        """Set state/value when LCN input object (command) is received."""
+        raise NotImplementedError('Pure virtual function.')
diff --git a/homeassistant/components/lifx/.translations/ca.json b/homeassistant/components/lifx/.translations/ca.json
index b3896d49e1d..e8ef5bd31bc 100644
--- a/homeassistant/components/lifx/.translations/ca.json
+++ b/homeassistant/components/lifx/.translations/ca.json
@@ -6,7 +6,7 @@
         },
         "step": {
             "confirm": {
-                "description": "Voleu configurar LIFX?",
+                "description": "Vols configurar LIFX?",
                 "title": "LIFX"
             }
         },
diff --git a/homeassistant/components/lifx/.translations/ru.json b/homeassistant/components/lifx/.translations/ru.json
index 5ad351b7a90..34f1d850a63 100644
--- a/homeassistant/components/lifx/.translations/ru.json
+++ b/homeassistant/components/lifx/.translations/ru.json
@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "no_devices_found": "\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 LIFX \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b \u0432 \u0441\u0435\u0442\u0438.",
-            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430"
+            "single_instance_allowed": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430."
         },
         "step": {
             "confirm": {
diff --git a/homeassistant/components/light/__init__.py b/homeassistant/components/light/__init__.py
index 41dbbcd6d0c..a16d1aaf87e 100644
--- a/homeassistant/components/light/__init__.py
+++ b/homeassistant/components/light/__init__.py
@@ -12,11 +12,13 @@ import os
 
 import voluptuous as vol
 
+from homeassistant.auth.permissions.const import POLICY_CONTROL
 from homeassistant.components.group import \
     ENTITY_ID_FORMAT as GROUP_ENTITY_ID_FORMAT
 from homeassistant.const import (
     ATTR_ENTITY_ID, SERVICE_TOGGLE, SERVICE_TURN_OFF, SERVICE_TURN_ON,
     STATE_ON)
+from homeassistant.exceptions import UnknownUser, Unauthorized
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.config_validation import PLATFORM_SCHEMA  # noqa
 from homeassistant.helpers.entity import ToggleEntity
@@ -88,7 +90,7 @@ VALID_BRIGHTNESS = vol.All(vol.Coerce(int), vol.Clamp(min=0, max=255))
 VALID_BRIGHTNESS_PCT = vol.All(vol.Coerce(float), vol.Range(min=0, max=100))
 
 LIGHT_TURN_ON_SCHEMA = vol.Schema({
-    ATTR_ENTITY_ID: cv.entity_ids,
+    ATTR_ENTITY_ID: cv.comp_entity_ids,
     vol.Exclusive(ATTR_PROFILE, COLOR_GROUP): cv.string,
     ATTR_TRANSITION: VALID_TRANSITION,
     ATTR_BRIGHTNESS: VALID_BRIGHTNESS,
@@ -115,13 +117,13 @@ LIGHT_TURN_ON_SCHEMA = vol.Schema({
 })
 
 LIGHT_TURN_OFF_SCHEMA = vol.Schema({
-    ATTR_ENTITY_ID: cv.entity_ids,
+    ATTR_ENTITY_ID: cv.comp_entity_ids,
     ATTR_TRANSITION: VALID_TRANSITION,
     ATTR_FLASH: vol.In([FLASH_SHORT, FLASH_LONG]),
 })
 
 LIGHT_TOGGLE_SCHEMA = vol.Schema({
-    ATTR_ENTITY_ID: cv.entity_ids,
+    ATTR_ENTITY_ID: cv.comp_entity_ids,
     ATTR_TRANSITION: VALID_TRANSITION,
 })
 
@@ -256,6 +258,21 @@ async def async_setup(hass, config):
         target_lights = component.async_extract_from_service(service)
         params.pop(ATTR_ENTITY_ID, None)
 
+        if service.context.user_id:
+            user = await hass.auth.async_get_user(service.context.user_id)
+            if user is None:
+                raise UnknownUser(context=service.context)
+
+            entity_perms = user.permissions.check_entity
+
+            for light in target_lights:
+                if not entity_perms(light, POLICY_CONTROL):
+                    raise Unauthorized(
+                        context=service.context,
+                        entity_id=light,
+                        permission=POLICY_CONTROL
+                    )
+
         preprocess_turn_on_alternatives(params)
 
         update_tasks = []
diff --git a/homeassistant/components/light/ads.py b/homeassistant/components/light/ads.py
index 0d97efa16a2..10df4c0bf72 100644
--- a/homeassistant/components/light/ads.py
+++ b/homeassistant/components/light/ads.py
@@ -63,15 +63,16 @@ class AdsLight(Light):
             self._brightness = value
             self.schedule_update_ha_state()
 
-        self.hass.async_add_job(
+        self.hass.async_add_executor_job(
             self._ads_hub.add_device_notification,
             self.ads_var_enable, self._ads_hub.PLCTYPE_BOOL, update_on_state
         )
-        self.hass.async_add_job(
-            self._ads_hub.add_device_notification,
-            self.ads_var_brightness, self._ads_hub.PLCTYPE_INT,
-            update_brightness
-        )
+        if self.ads_var_brightness is not None:
+            self.hass.async_add_executor_job(
+                self._ads_hub.add_device_notification,
+                self.ads_var_brightness, self._ads_hub.PLCTYPE_INT,
+                update_brightness
+            )
 
     @property
     def name(self):
@@ -96,8 +97,10 @@ class AdsLight(Light):
     @property
     def supported_features(self):
         """Flag supported features."""
+        support = 0
         if self.ads_var_brightness is not None:
-            return SUPPORT_BRIGHTNESS
+            support = SUPPORT_BRIGHTNESS
+        return support
 
     def turn_on(self, **kwargs):
         """Turn the light on or set a specific dimmer value."""
diff --git a/homeassistant/components/light/esphome.py b/homeassistant/components/light/esphome.py
new file mode 100644
index 00000000000..3b0889ede8e
--- /dev/null
+++ b/homeassistant/components/light/esphome.py
@@ -0,0 +1,160 @@
+"""Support for ESPHome lights."""
+import logging
+from typing import Optional, List, Tuple, TYPE_CHECKING
+
+from homeassistant.components.esphome import EsphomeEntity, \
+    platform_async_setup_entry
+from homeassistant.components.light import Light, SUPPORT_FLASH, \
+    SUPPORT_BRIGHTNESS, SUPPORT_TRANSITION, SUPPORT_COLOR, \
+    SUPPORT_WHITE_VALUE, SUPPORT_COLOR_TEMP, SUPPORT_EFFECT, ATTR_HS_COLOR, \
+    ATTR_FLASH, ATTR_TRANSITION, ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, \
+    ATTR_EFFECT, ATTR_WHITE_VALUE, FLASH_SHORT, FLASH_LONG
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.helpers.typing import HomeAssistantType
+import homeassistant.util.color as color_util
+
+if TYPE_CHECKING:
+    # pylint: disable=unused-import
+    from aioesphomeapi import LightInfo, LightState  # noqa
+
+DEPENDENCIES = ['esphome']
+_LOGGER = logging.getLogger(__name__)
+
+
+FLASH_LENGTHS = {
+    FLASH_SHORT: 2,
+    FLASH_LONG: 10,
+}
+
+
+async def async_setup_entry(hass: HomeAssistantType,
+                            entry: ConfigEntry, async_add_entities) -> None:
+    """Set up ESPHome lights based on a config entry."""
+    # pylint: disable=redefined-outer-name
+    from aioesphomeapi import LightInfo, LightState  # noqa
+
+    await platform_async_setup_entry(
+        hass, entry, async_add_entities,
+        component_key='light',
+        info_type=LightInfo, entity_type=EsphomeLight,
+        state_type=LightState
+    )
+
+
+class EsphomeLight(EsphomeEntity, Light):
+    """A switch implementation for ESPHome."""
+
+    @property
+    def _static_info(self) -> 'LightInfo':
+        return super()._static_info
+
+    @property
+    def _state(self) -> Optional['LightState']:
+        return super()._state
+
+    @property
+    def is_on(self) -> Optional[bool]:
+        """Return true if the switch is on."""
+        if self._state is None:
+            return None
+        return self._state.state
+
+    async def async_turn_on(self, **kwargs) -> None:
+        """Turn the entity on."""
+        data = {'key': self._static_info.key, 'state': True}
+        if ATTR_HS_COLOR in kwargs:
+            hue, sat = kwargs[ATTR_HS_COLOR]
+            red, green, blue = color_util.color_hsv_to_RGB(hue, sat, 100)
+            data['rgb'] = (red / 255, green / 255, blue / 255)
+        if ATTR_FLASH in kwargs:
+            data['flash'] = FLASH_LENGTHS[kwargs[ATTR_FLASH]]
+        if ATTR_TRANSITION in kwargs:
+            data['transition_length'] = kwargs[ATTR_TRANSITION]
+        if ATTR_BRIGHTNESS in kwargs:
+            data['brightness'] = kwargs[ATTR_BRIGHTNESS] / 255
+        if ATTR_COLOR_TEMP in kwargs:
+            data['color_temperature'] = kwargs[ATTR_COLOR_TEMP]
+        if ATTR_EFFECT in kwargs:
+            data['effect'] = kwargs[ATTR_EFFECT]
+        if ATTR_WHITE_VALUE in kwargs:
+            data['white'] = kwargs[ATTR_WHITE_VALUE] / 255
+        await self._client.light_command(**data)
+
+    async def async_turn_off(self, **kwargs) -> None:
+        """Turn the entity off."""
+        data = {'key': self._static_info.key, 'state': False}
+        if ATTR_FLASH in kwargs:
+            data['flash'] = FLASH_LENGTHS[kwargs[ATTR_FLASH]]
+        if ATTR_TRANSITION in kwargs:
+            data['transition_length'] = kwargs[ATTR_TRANSITION]
+        await self._client.light_command(**data)
+
+    @property
+    def brightness(self) -> Optional[int]:
+        """Return the brightness of this light between 0..255."""
+        if self._state is None:
+            return None
+        return round(self._state.brightness * 255)
+
+    @property
+    def hs_color(self) -> Optional[Tuple[float, float]]:
+        """Return the hue and saturation color value [float, float]."""
+        if self._state is None:
+            return None
+        return color_util.color_RGB_to_hs(
+            self._state.red * 255,
+            self._state.green * 255,
+            self._state.blue * 255)
+
+    @property
+    def color_temp(self) -> Optional[float]:
+        """Return the CT color value in mireds."""
+        if self._state is None:
+            return None
+        return self._state.color_temperature
+
+    @property
+    def white_value(self) -> Optional[int]:
+        """Return the white value of this light between 0..255."""
+        if self._state is None:
+            return None
+        return round(self._state.white * 255)
+
+    @property
+    def effect(self) -> Optional[str]:
+        """Return the current effect."""
+        if self._state is None:
+            return None
+        return self._state.effect
+
+    @property
+    def supported_features(self) -> int:
+        """Flag supported features."""
+        flags = SUPPORT_FLASH
+        if self._static_info.supports_brightness:
+            flags |= SUPPORT_BRIGHTNESS
+            flags |= SUPPORT_TRANSITION
+        if self._static_info.supports_rgb:
+            flags |= SUPPORT_COLOR
+        if self._static_info.supports_white_value:
+            flags |= SUPPORT_WHITE_VALUE
+        if self._static_info.supports_color_temperature:
+            flags |= SUPPORT_COLOR_TEMP
+        if self._static_info.effects:
+            flags |= SUPPORT_EFFECT
+        return flags
+
+    @property
+    def effect_list(self) -> List[str]:
+        """Return the list of supported effects."""
+        return self._static_info.effects
+
+    @property
+    def min_mireds(self) -> float:
+        """Return the coldest color_temp that this light supports."""
+        return self._static_info.min_mireds
+
+    @property
+    def max_mireds(self) -> float:
+        """Return the warmest color_temp that this light supports."""
+        return self._static_info.max_mireds
diff --git a/homeassistant/components/light/fibaro.py b/homeassistant/components/light/fibaro.py
index 636e4376ae2..6f2842524a2 100644
--- a/homeassistant/components/light/fibaro.py
+++ b/homeassistant/components/light/fibaro.py
@@ -9,12 +9,15 @@ import logging
 import asyncio
 from functools import partial
 
+from homeassistant.const import (
+    CONF_WHITE_VALUE)
+from homeassistant.components.fibaro import (
+    FIBARO_CONTROLLER, FIBARO_DEVICES, FibaroDevice,
+    CONF_DIMMING, CONF_COLOR, CONF_RESET_COLOR)
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS, ATTR_HS_COLOR, ATTR_WHITE_VALUE, ENTITY_ID_FORMAT,
     SUPPORT_BRIGHTNESS, SUPPORT_COLOR, SUPPORT_WHITE_VALUE, Light)
 import homeassistant.util.color as color_util
-from homeassistant.components.fibaro import (
-    FIBARO_CONTROLLER, FIBARO_DEVICES, FibaroDevice)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -56,20 +59,28 @@ class FibaroLight(FibaroDevice, Light):
 
     def __init__(self, fibaro_device, controller):
         """Initialize the light."""
-        self._supported_flags = 0
-        self._last_brightness = 0
-        self._color = (0, 0)
         self._brightness = None
+        self._color = (0, 0)
+        self._last_brightness = 0
+        self._supported_flags = 0
+        self._update_lock = asyncio.Lock()
         self._white = 0
 
-        self._update_lock = asyncio.Lock()
-        if 'levelChange' in fibaro_device.interfaces:
+        devconf = fibaro_device.device_config
+        self._reset_color = devconf.get(CONF_RESET_COLOR, False)
+        supports_color = 'color' in fibaro_device.properties and \
+                         'setColor' in fibaro_device.actions
+        supports_dimming = 'levelChange' in fibaro_device.interfaces
+        supports_white_v = 'setW' in fibaro_device.actions
+
+        # Configuration can overrride default capability detection
+        if devconf.get(CONF_DIMMING, supports_dimming):
             self._supported_flags |= SUPPORT_BRIGHTNESS
-        if 'color' in fibaro_device.properties and \
-                'setColor' in fibaro_device.actions:
+        if devconf.get(CONF_COLOR, supports_color):
             self._supported_flags |= SUPPORT_COLOR
-        if 'setW' in fibaro_device.actions:
+        if devconf.get(CONF_WHITE_VALUE, supports_white_v):
             self._supported_flags |= SUPPORT_WHITE_VALUE
+
         super().__init__(fibaro_device, controller)
         self.entity_id = ENTITY_ID_FORMAT.format(self.ha_id)
 
@@ -117,6 +128,12 @@ class FibaroLight(FibaroDevice, Light):
                 self._brightness = scaleto100(target_brightness)
 
         if self._supported_flags & SUPPORT_COLOR:
+            if self._reset_color and \
+                    kwargs.get(ATTR_WHITE_VALUE) is None and \
+                    kwargs.get(ATTR_HS_COLOR) is None and \
+                    kwargs.get(ATTR_BRIGHTNESS) is None:
+                self._color = (100, 0)
+
             # Update based on parameters
             self._white = kwargs.get(ATTR_WHITE_VALUE, self._white)
             self._color = kwargs.get(ATTR_HS_COLOR, self._color)
@@ -131,6 +148,10 @@ class FibaroLight(FibaroDevice, Light):
                 self.set_level(int(self._brightness))
             return
 
+        if self._reset_color:
+            bri255 = scaleto255(self._brightness)
+            self.call_set_color(bri255, bri255, bri255, bri255)
+
         if self._supported_flags & SUPPORT_BRIGHTNESS:
             self.set_level(int(self._brightness))
             return
diff --git a/homeassistant/components/light/homekit_controller.py b/homeassistant/components/light/homekit_controller.py
index b874bc49f0e..7c8119f6e89 100644
--- a/homeassistant/components/light/homekit_controller.py
+++ b/homeassistant/components/light/homekit_controller.py
@@ -38,11 +38,12 @@ class HomeKitLight(HomeKitEntity, Light):
 
     def update_characteristics(self, characteristics):
         """Synchronise light state with Home Assistant."""
-        import homekit  # pylint: disable=import-error
+        # pylint: disable=import-error
+        from homekit.model.characteristics import CharacteristicsTypes
 
         for characteristic in characteristics:
             ctype = characteristic['type']
-            ctype = homekit.CharacteristicsTypes.get_short(ctype)
+            ctype = CharacteristicsTypes.get_short(ctype)
             if ctype == "on":
                 self._chars['on'] = characteristic['iid']
                 self._on = characteristic['value']
diff --git a/homeassistant/components/light/homeworks.py b/homeassistant/components/light/homeworks.py
new file mode 100644
index 00000000000..3ba5f805c52
--- /dev/null
+++ b/homeassistant/components/light/homeworks.py
@@ -0,0 +1,104 @@
+"""Component for interfacing to Lutron Homeworks lights.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/light.homeworks/
+"""
+import logging
+
+from homeassistant.components.homeworks import (
+    HomeworksDevice, HOMEWORKS_CONTROLLER, ENTITY_SIGNAL,
+    CONF_DIMMERS, CONF_ADDR, CONF_RATE)
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS, SUPPORT_BRIGHTNESS, Light)
+from homeassistant.const import CONF_NAME
+from homeassistant.core import callback
+from homeassistant.helpers.dispatcher import (
+    async_dispatcher_connect)
+
+DEPENDENCIES = ['homeworks']
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_entities, discover_info=None):
+    """Set up Homeworks lights."""
+    if discover_info is None:
+        return
+
+    controller = hass.data[HOMEWORKS_CONTROLLER]
+    devs = []
+    for dimmer in discover_info[CONF_DIMMERS]:
+        dev = HomeworksLight(controller, dimmer[CONF_ADDR],
+                             dimmer[CONF_NAME], dimmer[CONF_RATE])
+        devs.append(dev)
+    add_entities(devs, True)
+
+
+class HomeworksLight(HomeworksDevice, Light):
+    """Homeworks Light."""
+
+    def __init__(self, controller, addr, name, rate):
+        """Create device with Addr, name, and rate."""
+        super().__init__(controller, addr, name)
+        self._rate = rate
+        self._level = 0
+        self._prev_level = 0
+
+    async def async_added_to_hass(self):
+        """Call when entity is added to hass."""
+        signal = ENTITY_SIGNAL.format(self._addr)
+        _LOGGER.debug('connecting %s', signal)
+        async_dispatcher_connect(
+            self.hass, signal, self._update_callback)
+        self._controller.request_dimmer_level(self._addr)
+
+    @property
+    def supported_features(self):
+        """Supported features."""
+        return SUPPORT_BRIGHTNESS
+
+    def turn_on(self, **kwargs):
+        """Turn on the light."""
+        if ATTR_BRIGHTNESS in kwargs:
+            new_level = kwargs[ATTR_BRIGHTNESS]
+        elif self._prev_level == 0:
+            new_level = 255
+        else:
+            new_level = self._prev_level
+        self._set_brightness(new_level)
+
+    def turn_off(self, **kwargs):
+        """Turn off the light."""
+        self._set_brightness(0)
+
+    @property
+    def brightness(self):
+        """Control the brightness."""
+        return self._level
+
+    def _set_brightness(self, level):
+        """Send the brightness level to the device."""
+        self._controller.fade_dim(
+            float((level*100.)/255.), self._rate,
+            0, self._addr)
+
+    @property
+    def device_state_attributes(self):
+        """Supported attributes."""
+        return {'homeworks_address': self._addr}
+
+    @property
+    def is_on(self):
+        """Is the light on/off."""
+        return self._level != 0
+
+    @callback
+    def _update_callback(self, msg_type, values):
+        """Process device specific messages."""
+        from pyhomeworks.pyhomeworks import HW_LIGHT_CHANGED
+
+        if msg_type == HW_LIGHT_CHANGED:
+            self._level = int((values[1] * 255.)/100.)
+            if self._level != 0:
+                self._prev_level = self._level
+            self.async_schedule_update_ha_state()
diff --git a/homeassistant/components/light/hue.py b/homeassistant/components/light/hue.py
index 686fc01caf9..28a2d79de13 100644
--- a/homeassistant/components/light/hue.py
+++ b/homeassistant/components/light/hue.py
@@ -298,7 +298,8 @@ class HueLight(Light):
     @property
     def device_info(self):
         """Return the device info."""
-        if self.light.type in ('LightGroup', 'Room'):
+        if self.light.type in ('LightGroup', 'Room',
+                               'Luminaire', 'LightSource'):
             return None
 
         return {
diff --git a/homeassistant/components/light/lcn.py b/homeassistant/components/light/lcn.py
new file mode 100644
index 00000000000..3f00d305a14
--- /dev/null
+++ b/homeassistant/components/light/lcn.py
@@ -0,0 +1,121 @@
+"""
+Support for LCN lights.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/light.lcn/
+"""
+
+from homeassistant.components.lcn import (
+    CONF_CONNECTIONS, CONF_DIMMABLE, CONF_OUTPUT, CONF_TRANSITION, DATA_LCN,
+    LcnDevice, get_connection)
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS, ATTR_TRANSITION, SUPPORT_BRIGHTNESS, SUPPORT_TRANSITION,
+    Light)
+from homeassistant.const import CONF_ADDRESS
+
+DEPENDENCIES = ['lcn']
+
+
+async def async_setup_platform(hass, hass_config, async_add_entities,
+                               discovery_info=None):
+    """Set up the LCN light platform."""
+    import pypck
+
+    devices = []
+    for config in discovery_info:
+        address, connection_id = config[CONF_ADDRESS]
+        addr = pypck.lcn_addr.LcnAddr(*address)
+        connections = hass.data[DATA_LCN][CONF_CONNECTIONS]
+        connection = get_connection(connections, connection_id)
+        address_connection = connection.get_address_conn(addr)
+
+        devices.append(LcnOutputLight(config, address_connection))
+    async_add_entities(devices)
+
+
+class LcnOutputLight(LcnDevice, Light):
+    """Representation of a LCN light for output ports."""
+
+    def __init__(self, config, address_connection):
+        """Initialize the LCN light."""
+        super().__init__(config, address_connection)
+
+        self.output = self.pypck.lcn_defs.OutputPort[config[CONF_OUTPUT]]
+
+        self._transition = self.pypck.lcn_defs.time_to_ramp_value(
+            config[CONF_TRANSITION])
+        self.dimmable = config[CONF_DIMMABLE]
+
+        self._brightness = 255
+        self._is_on = None
+        self._is_dimming_to_zero = False
+
+    async def async_added_to_hass(self) -> None:
+        """Run when entity about to be added to hass."""
+        await super().async_added_to_hass()
+        self.hass.async_create_task(
+            self.address_connection.activate_status_request_handler(
+                self.output))
+
+    @property
+    def supported_features(self):
+        """Flag supported features."""
+        features = SUPPORT_TRANSITION
+        if self.dimmable:
+            features |= SUPPORT_BRIGHTNESS
+        return features
+
+    @property
+    def brightness(self):
+        """Return the brightness of this light between 0..255."""
+        return self._brightness
+
+    @property
+    def is_on(self):
+        """Return True if entity is on."""
+        return self._is_on
+
+    async def async_turn_on(self, **kwargs):
+        """Turn the entity on."""
+        self._is_on = True
+        self._is_dimming_to_zero = False
+        if ATTR_BRIGHTNESS in kwargs:
+            percent = int(kwargs[ATTR_BRIGHTNESS] / 255. * 100)
+        else:
+            percent = 100
+        if ATTR_TRANSITION in kwargs:
+            transition = self.pypck.lcn_defs.time_to_ramp_value(
+                kwargs[ATTR_TRANSITION] * 1000)
+        else:
+            transition = self._transition
+
+        self.address_connection.dim_output(self.output.value, percent,
+                                           transition)
+        await self.async_update_ha_state()
+
+    async def async_turn_off(self, **kwargs):
+        """Turn the entity off."""
+        self._is_on = False
+        if ATTR_TRANSITION in kwargs:
+            transition = self.pypck.lcn_defs.time_to_ramp_value(
+                kwargs[ATTR_TRANSITION] * 1000)
+        else:
+            transition = self._transition
+
+        self._is_dimming_to_zero = bool(transition)
+
+        self.address_connection.dim_output(self.output.value, 0, transition)
+        await self.async_update_ha_state()
+
+    def input_received(self, input_obj):
+        """Set light state when LCN input object (command) is received."""
+        if not isinstance(input_obj, self.pypck.inputs.ModStatusOutput) or \
+                input_obj.get_output_id() != self.output.value:
+            return
+
+        self._brightness = int(input_obj.get_percent() / 100.*255)
+        if self.brightness == 0:
+            self._is_dimming_to_zero = False
+        if not self._is_dimming_to_zero:
+            self._is_on = self.brightness > 0
+        self.async_schedule_update_ha_state()
diff --git a/homeassistant/components/light/mqtt/schema_basic.py b/homeassistant/components/light/mqtt/schema_basic.py
index 74f3dbdec91..a263ed66d6d 100644
--- a/homeassistant/components/light/mqtt/schema_basic.py
+++ b/homeassistant/components/light/mqtt/schema_basic.py
@@ -15,13 +15,13 @@ from homeassistant.components.light import (
     ATTR_WHITE_VALUE, Light, SUPPORT_BRIGHTNESS, SUPPORT_COLOR_TEMP,
     SUPPORT_EFFECT, SUPPORT_COLOR, SUPPORT_WHITE_VALUE)
 from homeassistant.const import (
-    CONF_BRIGHTNESS, CONF_COLOR_TEMP, CONF_EFFECT, CONF_HS, CONF_NAME,
-    CONF_OPTIMISTIC, CONF_PAYLOAD_OFF, CONF_PAYLOAD_ON, STATE_ON,
+    CONF_BRIGHTNESS, CONF_COLOR_TEMP, CONF_DEVICE, CONF_EFFECT, CONF_HS,
+    CONF_NAME, CONF_OPTIMISTIC, CONF_PAYLOAD_OFF, CONF_PAYLOAD_ON, STATE_ON,
     CONF_RGB, CONF_STATE, CONF_VALUE_TEMPLATE, CONF_WHITE_VALUE, CONF_XY)
 from homeassistant.components.mqtt import (
     CONF_AVAILABILITY_TOPIC, CONF_COMMAND_TOPIC, CONF_PAYLOAD_AVAILABLE,
     CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, CONF_RETAIN, CONF_STATE_TOPIC,
-    MqttAvailability, MqttDiscoveryUpdate, subscription)
+    MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription)
 from homeassistant.helpers.restore_state import RestoreEntity
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.color as color_util
@@ -34,6 +34,7 @@ CONF_BRIGHTNESS_COMMAND_TOPIC = 'brightness_command_topic'
 CONF_BRIGHTNESS_SCALE = 'brightness_scale'
 CONF_BRIGHTNESS_STATE_TOPIC = 'brightness_state_topic'
 CONF_BRIGHTNESS_VALUE_TEMPLATE = 'brightness_value_template'
+CONF_COLOR_TEMP_COMMAND_TEMPLATE = 'color_temp_command_template'
 CONF_COLOR_TEMP_COMMAND_TOPIC = 'color_temp_command_topic'
 CONF_COLOR_TEMP_STATE_TOPIC = 'color_temp_state_topic'
 CONF_COLOR_TEMP_VALUE_TEMPLATE = 'color_temp_value_template'
@@ -75,6 +76,7 @@ PLATFORM_SCHEMA_BASIC = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
         vol.All(vol.Coerce(int), vol.Range(min=1)),
     vol.Optional(CONF_BRIGHTNESS_STATE_TOPIC): mqtt.valid_subscribe_topic,
     vol.Optional(CONF_BRIGHTNESS_VALUE_TEMPLATE): cv.template,
+    vol.Optional(CONF_COLOR_TEMP_COMMAND_TEMPLATE): cv.template,
     vol.Optional(CONF_COLOR_TEMP_COMMAND_TOPIC): mqtt.valid_publish_topic,
     vol.Optional(CONF_COLOR_TEMP_STATE_TOPIC): mqtt.valid_subscribe_topic,
     vol.Optional(CONF_COLOR_TEMP_VALUE_TEMPLATE): cv.template,
@@ -105,6 +107,7 @@ PLATFORM_SCHEMA_BASIC = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_XY_VALUE_TEMPLATE): cv.template,
     vol.Optional(CONF_ON_COMMAND_TYPE, default=DEFAULT_ON_COMMAND_TYPE):
         vol.In(VALUES_ON_COMMAND_TYPE),
+    vol.Optional(CONF_DEVICE): mqtt.MQTT_ENTITY_DEVICE_INFO_SCHEMA,
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
@@ -117,7 +120,9 @@ async def async_setup_entity_basic(hass, config, async_add_entities,
     async_add_entities([MqttLight(config, discovery_hash)])
 
 
-class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light, RestoreEntity):
+# pylint: disable=too-many-ancestors
+class MqttLight(MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo,
+                Light, RestoreEntity):
     """Representation of a MQTT light."""
 
     def __init__(self, config, discovery_hash):
@@ -151,11 +156,13 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light, RestoreEntity):
         payload_available = config.get(CONF_PAYLOAD_AVAILABLE)
         payload_not_available = config.get(CONF_PAYLOAD_NOT_AVAILABLE)
         qos = config.get(CONF_QOS)
+        device_config = config.get(CONF_DEVICE)
 
         MqttAvailability.__init__(self, availability_topic, qos,
                                   payload_available, payload_not_available)
         MqttDiscoveryUpdate.__init__(self, discovery_hash,
                                      self.discovery_update)
+        MqttEntityDeviceInfo.__init__(self, device_config)
 
     async def async_added_to_hass(self):
         """Subscribe to MQTT events."""
@@ -202,6 +209,8 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light, RestoreEntity):
         self._templates = {
             CONF_BRIGHTNESS: config.get(CONF_BRIGHTNESS_VALUE_TEMPLATE),
             CONF_COLOR_TEMP: config.get(CONF_COLOR_TEMP_VALUE_TEMPLATE),
+            CONF_COLOR_TEMP_COMMAND_TEMPLATE:
+                config.get(CONF_COLOR_TEMP_COMMAND_TEMPLATE),
             CONF_EFFECT: config.get(CONF_EFFECT_VALUE_TEMPLATE),
             CONF_HS: config.get(CONF_HS_VALUE_TEMPLATE),
             CONF_RGB: config.get(CONF_RGB_VALUE_TEMPLATE),
@@ -300,7 +309,7 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light, RestoreEntity):
             device_value = float(payload)
             percent_bright = \
                 device_value / self._config.get(CONF_BRIGHTNESS_SCALE)
-            self._brightness = int(percent_bright * 255)
+            self._brightness = percent_bright * 255
             self.async_schedule_update_ha_state()
 
         if self._topic[CONF_BRIGHTNESS_STATE_TOPIC] is not None:
@@ -330,7 +339,7 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light, RestoreEntity):
             if self._topic[CONF_BRIGHTNESS_STATE_TOPIC] is None:
                 percent_bright = \
                     float(color_util.color_RGB_to_hsv(*rgb)[2]) / 100.0
-                self._brightness = int(percent_bright * 255)
+                self._brightness = percent_bright * 255
             self.async_schedule_update_ha_state()
 
         if self._topic[CONF_RGB_STATE_TOPIC] is not None:
@@ -436,7 +445,7 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light, RestoreEntity):
             device_value = float(payload)
             percent_white = \
                 device_value / self._config.get(CONF_WHITE_VALUE_SCALE)
-            self._white_value = int(percent_white * 255)
+            self._white_value = percent_white * 255
             self.async_schedule_update_ha_state()
 
         if self._topic[CONF_WHITE_VALUE_STATE_TOPIC] is not None:
@@ -484,13 +493,17 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light, RestoreEntity):
 
     async def async_will_remove_from_hass(self):
         """Unsubscribe when removed."""
-        await subscription.async_unsubscribe_topics(self.hass, self._sub_state)
+        self._sub_state = await subscription.async_unsubscribe_topics(
+            self.hass, self._sub_state)
         await MqttAvailability.async_will_remove_from_hass(self)
 
     @property
     def brightness(self):
         """Return the brightness of this light between 0..255."""
-        return self._brightness
+        brightness = self._brightness
+        if brightness:
+            brightness = min(round(brightness), 255)
+        return brightness
 
     @property
     def hs_color(self):
@@ -505,7 +518,10 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light, RestoreEntity):
     @property
     def white_value(self):
         """Return the white property."""
-        return self._white_value
+        white_value = self._white_value
+        if white_value:
+            white_value = min(round(white_value), 255)
+        return white_value
 
     @property
     def should_poll(self):
@@ -633,8 +649,9 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light, RestoreEntity):
         if ATTR_BRIGHTNESS in kwargs and \
            self._topic[CONF_BRIGHTNESS_COMMAND_TOPIC] is not None:
             percent_bright = float(kwargs[ATTR_BRIGHTNESS]) / 255
+            brightness_scale = self._config.get(CONF_BRIGHTNESS_SCALE)
             device_brightness = \
-                int(percent_bright * self._config.get(CONF_BRIGHTNESS_SCALE))
+                min(round(percent_bright * brightness_scale), brightness_scale)
             mqtt.async_publish(
                 self.hass, self._topic[CONF_BRIGHTNESS_COMMAND_TOPIC],
                 device_brightness, self._config.get(CONF_QOS),
@@ -669,6 +686,13 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light, RestoreEntity):
         if ATTR_COLOR_TEMP in kwargs and \
            self._topic[CONF_COLOR_TEMP_COMMAND_TOPIC] is not None:
             color_temp = int(kwargs[ATTR_COLOR_TEMP])
+            tpl = self._templates[CONF_COLOR_TEMP_COMMAND_TEMPLATE]
+
+            if tpl:
+                color_temp = tpl.async_render({
+                    'value': color_temp,
+                })
+
             mqtt.async_publish(
                 self.hass, self._topic[CONF_COLOR_TEMP_COMMAND_TOPIC],
                 color_temp, self._config.get(CONF_QOS),
@@ -694,8 +718,9 @@ class MqttLight(MqttAvailability, MqttDiscoveryUpdate, Light, RestoreEntity):
         if ATTR_WHITE_VALUE in kwargs and \
            self._topic[CONF_WHITE_VALUE_COMMAND_TOPIC] is not None:
             percent_white = float(kwargs[ATTR_WHITE_VALUE]) / 255
+            white_scale = self._config.get(CONF_WHITE_VALUE_SCALE)
             device_white_value = \
-                int(percent_white * self._config.get(CONF_WHITE_VALUE_SCALE))
+                min(round(percent_white * white_scale), white_scale)
             mqtt.async_publish(
                 self.hass, self._topic[CONF_WHITE_VALUE_COMMAND_TOPIC],
                 device_white_value, self._config.get(CONF_QOS),
diff --git a/homeassistant/components/light/mqtt/schema_json.py b/homeassistant/components/light/mqtt/schema_json.py
index 8a72f7b1f89..f0888726d78 100644
--- a/homeassistant/components/light/mqtt/schema_json.py
+++ b/homeassistant/components/light/mqtt/schema_json.py
@@ -18,10 +18,10 @@ from homeassistant.components.light import (
 from homeassistant.components.mqtt import (
     CONF_AVAILABILITY_TOPIC, CONF_COMMAND_TOPIC, CONF_PAYLOAD_AVAILABLE,
     CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, CONF_RETAIN, CONF_STATE_TOPIC,
-    MqttAvailability, MqttDiscoveryUpdate, subscription)
+    MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription)
 from homeassistant.const import (
-    CONF_BRIGHTNESS, CONF_COLOR_TEMP, CONF_EFFECT, CONF_NAME, CONF_OPTIMISTIC,
-    CONF_RGB, CONF_WHITE_VALUE, CONF_XY, STATE_ON)
+    CONF_BRIGHTNESS, CONF_COLOR_TEMP, CONF_DEVICE, CONF_EFFECT, CONF_NAME,
+    CONF_OPTIMISTIC, CONF_RGB, CONF_WHITE_VALUE, CONF_XY, STATE_ON)
 from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.restore_state import RestoreEntity
@@ -80,6 +80,7 @@ PLATFORM_SCHEMA_JSON = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_XY, default=DEFAULT_XY): cv.boolean,
     vol.Optional(CONF_HS, default=DEFAULT_HS): cv.boolean,
     vol.Required(CONF_COMMAND_TOPIC): mqtt.valid_publish_topic,
+    vol.Optional(CONF_DEVICE): mqtt.MQTT_ENTITY_DEVICE_INFO_SCHEMA,
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
@@ -89,8 +90,9 @@ async def async_setup_entity_json(hass: HomeAssistantType, config: ConfigType,
     async_add_entities([MqttLightJson(config, discovery_hash)])
 
 
-class MqttLightJson(MqttAvailability, MqttDiscoveryUpdate, Light,
-                    RestoreEntity):
+# pylint: disable=too-many-ancestors
+class MqttLightJson(MqttAvailability, MqttDiscoveryUpdate,
+                    MqttEntityDeviceInfo, Light, RestoreEntity):
     """Representation of a MQTT JSON light."""
 
     def __init__(self, config, discovery_hash):
@@ -116,11 +118,13 @@ class MqttLightJson(MqttAvailability, MqttDiscoveryUpdate, Light,
         payload_available = config.get(CONF_PAYLOAD_AVAILABLE)
         payload_not_available = config.get(CONF_PAYLOAD_NOT_AVAILABLE)
         qos = config.get(CONF_QOS)
+        device_config = config.get(CONF_DEVICE)
 
         MqttAvailability.__init__(self, availability_topic, qos,
                                   payload_available, payload_not_available)
         MqttDiscoveryUpdate.__init__(self, discovery_hash,
                                      self.discovery_update)
+        MqttEntityDeviceInfo.__init__(self, device_config)
 
     async def async_added_to_hass(self):
         """Subscribe to MQTT events."""
@@ -297,7 +301,8 @@ class MqttLightJson(MqttAvailability, MqttDiscoveryUpdate, Light,
 
     async def async_will_remove_from_hass(self):
         """Unsubscribe when removed."""
-        await subscription.async_unsubscribe_topics(self.hass, self._sub_state)
+        self._sub_state = await subscription.async_unsubscribe_topics(
+            self.hass, self._sub_state)
         await MqttAvailability.async_will_remove_from_hass(self)
 
     @property
diff --git a/homeassistant/components/light/mqtt/schema_template.py b/homeassistant/components/light/mqtt/schema_template.py
index 419472d1927..9f04e9a6468 100644
--- a/homeassistant/components/light/mqtt/schema_template.py
+++ b/homeassistant/components/light/mqtt/schema_template.py
@@ -14,11 +14,12 @@ from homeassistant.components.light import (
     ATTR_HS_COLOR, ATTR_TRANSITION, ATTR_WHITE_VALUE, Light,
     SUPPORT_BRIGHTNESS, SUPPORT_COLOR_TEMP, SUPPORT_EFFECT, SUPPORT_FLASH,
     SUPPORT_COLOR, SUPPORT_TRANSITION, SUPPORT_WHITE_VALUE)
-from homeassistant.const import CONF_NAME, CONF_OPTIMISTIC, STATE_ON, STATE_OFF
+from homeassistant.const import (
+    CONF_DEVICE, CONF_NAME, CONF_OPTIMISTIC, STATE_ON, STATE_OFF)
 from homeassistant.components.mqtt import (
     CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC, CONF_COMMAND_TOPIC,
     CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, CONF_RETAIN,
-    MqttAvailability, MqttDiscoveryUpdate, subscription)
+    MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription)
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.color as color_util
 from homeassistant.helpers.restore_state import RestoreEntity
@@ -43,6 +44,7 @@ CONF_GREEN_TEMPLATE = 'green_template'
 CONF_RED_TEMPLATE = 'red_template'
 CONF_STATE_TEMPLATE = 'state_template'
 CONF_WHITE_VALUE_TEMPLATE = 'white_value_template'
+CONF_UNIQUE_ID = 'unique_id'
 
 PLATFORM_SCHEMA_TEMPLATE = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_BLUE_TEMPLATE): cv.template,
@@ -63,6 +65,8 @@ PLATFORM_SCHEMA_TEMPLATE = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
     vol.Required(CONF_COMMAND_TOPIC): mqtt.valid_publish_topic,
     vol.Optional(CONF_QOS, default=mqtt.DEFAULT_QOS):
         vol.All(vol.Coerce(int), vol.In([0, 1, 2])),
+    vol.Optional(CONF_UNIQUE_ID): cv.string,
+    vol.Optional(CONF_DEVICE): mqtt.MQTT_ENTITY_DEVICE_INFO_SCHEMA,
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
@@ -72,8 +76,9 @@ async def async_setup_entity_template(hass, config, async_add_entities,
     async_add_entities([MqttTemplate(config, discovery_hash)])
 
 
-class MqttTemplate(MqttAvailability, MqttDiscoveryUpdate, Light,
-                   RestoreEntity):
+# pylint: disable=too-many-ancestors
+class MqttTemplate(MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo,
+                   Light, RestoreEntity):
     """Representation of a MQTT Template light."""
 
     def __init__(self, config, discovery_hash):
@@ -91,6 +96,7 @@ class MqttTemplate(MqttAvailability, MqttDiscoveryUpdate, Light,
         self._white_value = None
         self._hs = None
         self._effect = None
+        self._unique_id = config.get(CONF_UNIQUE_ID)
 
         # Load config
         self._setup_from_config(config)
@@ -99,11 +105,13 @@ class MqttTemplate(MqttAvailability, MqttDiscoveryUpdate, Light,
         payload_available = config.get(CONF_PAYLOAD_AVAILABLE)
         payload_not_available = config.get(CONF_PAYLOAD_NOT_AVAILABLE)
         qos = config.get(CONF_QOS)
+        device_config = config.get(CONF_DEVICE)
 
         MqttAvailability.__init__(self, availability_topic, qos,
                                   payload_available, payload_not_available)
         MqttDiscoveryUpdate.__init__(self, discovery_hash,
                                      self.discovery_update)
+        MqttEntityDeviceInfo.__init__(self, device_config)
 
     async def async_added_to_hass(self):
         """Subscribe to MQTT events."""
@@ -266,7 +274,8 @@ class MqttTemplate(MqttAvailability, MqttDiscoveryUpdate, Light,
 
     async def async_will_remove_from_hass(self):
         """Unsubscribe when removed."""
-        await subscription.async_unsubscribe_topics(self.hass, self._sub_state)
+        self._sub_state = await subscription.async_unsubscribe_topics(
+            self.hass, self._sub_state)
         await MqttAvailability.async_will_remove_from_hass(self)
 
     @property
@@ -302,6 +311,11 @@ class MqttTemplate(MqttAvailability, MqttDiscoveryUpdate, Light,
         """Return the name of the entity."""
         return self._config.get(CONF_NAME)
 
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._unique_id
+
     @property
     def is_on(self):
         """Return True if entity is on."""
diff --git a/homeassistant/components/light/plum_lightpad.py b/homeassistant/components/light/plum_lightpad.py
new file mode 100644
index 00000000000..fa15c842deb
--- /dev/null
+++ b/homeassistant/components/light/plum_lightpad.py
@@ -0,0 +1,185 @@
+"""
+Support for Plum Lightpad switches.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/light.plum_lightpad/
+"""
+from homeassistant.components.light import (
+    ATTR_BRIGHTNESS, ATTR_HS_COLOR, SUPPORT_BRIGHTNESS, SUPPORT_COLOR, Light)
+from homeassistant.components.plum_lightpad import PLUM_DATA
+import homeassistant.util.color as color_util
+
+DEPENDENCIES = ['plum_lightpad']
+
+
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
+    """Initialize the Plum Lightpad Light and GlowRing."""
+    if discovery_info is None:
+        return
+
+    plum = hass.data[PLUM_DATA]
+
+    entities = []
+
+    if 'lpid' in discovery_info:
+        lightpad = plum.get_lightpad(discovery_info['lpid'])
+        entities.append(GlowRing(lightpad=lightpad))
+
+    if 'llid' in discovery_info:
+        logical_load = plum.get_load(discovery_info['llid'])
+        entities.append(PlumLight(load=logical_load))
+
+    if entities:
+        async_add_entities(entities)
+
+
+class PlumLight(Light):
+    """Represenation of a Plum Lightpad dimmer."""
+
+    def __init__(self, load):
+        """Initialize the light."""
+        self._load = load
+        self._brightness = load.level
+
+    async def async_added_to_hass(self):
+        """Subscribe to dimmerchange events."""
+        self._load.add_event_listener('dimmerchange', self.dimmerchange)
+
+    def dimmerchange(self, event):
+        """Change event handler updating the brightness."""
+        self._brightness = event['level']
+        self.schedule_update_ha_state()
+
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False
+
+    @property
+    def name(self):
+        """Return the name of the switch if any."""
+        return self._load.name
+
+    @property
+    def brightness(self) -> int:
+        """Return the brightness of this switch between 0..255."""
+        return self._brightness
+
+    @property
+    def is_on(self) -> bool:
+        """Return true if light is on."""
+        return self._brightness > 0
+
+    @property
+    def supported_features(self):
+        """Flag supported features."""
+        if self._load.dimmable:
+            return SUPPORT_BRIGHTNESS
+        return None
+
+    async def async_turn_on(self, **kwargs):
+        """Turn the light on."""
+        if ATTR_BRIGHTNESS in kwargs:
+            await self._load.turn_on(kwargs[ATTR_BRIGHTNESS])
+        else:
+            await self._load.turn_on()
+
+    async def async_turn_off(self, **kwargs):
+        """Turn the light off."""
+        await self._load.turn_off()
+
+
+class GlowRing(Light):
+    """Represenation of a Plum Lightpad dimmer glow ring."""
+
+    def __init__(self, lightpad):
+        """Initialize the light."""
+        self._lightpad = lightpad
+        self._name = '{} Glow Ring'.format(lightpad.friendly_name)
+
+        self._state = lightpad.glow_enabled
+        self._brightness = lightpad.glow_intensity * 255.0
+
+        self._red = lightpad.glow_color['red']
+        self._green = lightpad.glow_color['green']
+        self._blue = lightpad.glow_color['blue']
+
+    async def async_added_to_hass(self):
+        """Subscribe to configchange events."""
+        self._lightpad.add_event_listener('configchange',
+                                          self.configchange_event)
+
+    def configchange_event(self, event):
+        """Handle Configuration change event."""
+        config = event['changes']
+
+        self._state = config['glowEnabled']
+        self._brightness = config['glowIntensity'] * 255.0
+
+        self._red = config['glowColor']['red']
+        self._green = config['glowColor']['green']
+        self._blue = config['glowColor']['blue']
+
+        self.schedule_update_ha_state()
+
+    @property
+    def hs_color(self):
+        """Return the hue and saturation color value [float, float]."""
+        return color_util.color_RGB_to_hs(self._red, self._green, self._blue)
+
+    @property
+    def should_poll(self):
+        """No polling needed."""
+        return False
+
+    @property
+    def name(self):
+        """Return the name of the switch if any."""
+        return self._name
+
+    @property
+    def brightness(self) -> int:
+        """Return the brightness of this switch between 0..255."""
+        return self._brightness
+
+    @property
+    def glow_intensity(self):
+        """Brightness in float form."""
+        return self._brightness / 255.0
+
+    @property
+    def is_on(self) -> bool:
+        """Return true if light is on."""
+        return self._state
+
+    @property
+    def icon(self):
+        """Return the crop-portait icon representing the glow ring."""
+        return 'mdi:crop-portrait'
+
+    @property
+    def supported_features(self):
+        """Flag supported features."""
+        return SUPPORT_BRIGHTNESS | SUPPORT_COLOR
+
+    async def async_turn_on(self, **kwargs):
+        """Turn the light on."""
+        if ATTR_BRIGHTNESS in kwargs:
+            await self._lightpad.set_config(
+                {"glowIntensity": kwargs[ATTR_BRIGHTNESS]})
+        elif ATTR_HS_COLOR in kwargs:
+            hs_color = kwargs[ATTR_HS_COLOR]
+            red, green, blue = color_util.color_hs_to_RGB(*hs_color)
+            await self._lightpad.set_glow_color(red, green, blue, 0)
+        else:
+            await self._lightpad.set_config({"glowEnabled": True})
+
+    async def async_turn_off(self, **kwargs):
+        """Turn the light off."""
+        if ATTR_BRIGHTNESS in kwargs:
+            await self._lightpad.set_config(
+                {"glowIntensity": kwargs[ATTR_BRIGHTNESS]})
+        else:
+            await self._lightpad.set_config(
+                {"glowEnabled": False})
diff --git a/homeassistant/components/light/rflink.py b/homeassistant/components/light/rflink.py
index 3b60280c582..ef389bb84f9 100644
--- a/homeassistant/components/light/rflink.py
+++ b/homeassistant/components/light/rflink.py
@@ -148,17 +148,29 @@ async def async_setup_platform(hass, config, async_add_entities,
         hass.data[DATA_DEVICE_REGISTER][EVENT_KEY_COMMAND] = add_new_device
 
 
+# pylint: disable=too-many-ancestors
 class RflinkLight(SwitchableRflinkDevice, Light):
     """Representation of a Rflink light."""
 
     pass
 
 
+# pylint: disable=too-many-ancestors
 class DimmableRflinkLight(SwitchableRflinkDevice, Light):
     """Rflink light device that support dimming."""
 
     _brightness = 255
 
+    async def async_added_to_hass(self):
+        """Restore RFLink light brightness attribute."""
+        await super().async_added_to_hass()
+
+        old_state = await self.async_get_last_state()
+        if old_state is not None and \
+                old_state.attributes.get(ATTR_BRIGHTNESS) is not None:
+            # restore also brightness in dimmables devices
+            self._brightness = int(old_state.attributes[ATTR_BRIGHTNESS])
+
     async def async_turn_on(self, **kwargs):
         """Turn the device on."""
         if ATTR_BRIGHTNESS in kwargs:
@@ -179,6 +191,7 @@ class DimmableRflinkLight(SwitchableRflinkDevice, Light):
         return SUPPORT_BRIGHTNESS
 
 
+# pylint: disable=too-many-ancestors
 class HybridRflinkLight(SwitchableRflinkDevice, Light):
     """Rflink light device that sends out both dim and on/off commands.
 
@@ -196,6 +209,16 @@ class HybridRflinkLight(SwitchableRflinkDevice, Light):
 
     _brightness = 255
 
+    async def async_added_to_hass(self):
+        """Restore RFLink light brightness attribute."""
+        await super().async_added_to_hass()
+
+        old_state = await self.async_get_last_state()
+        if old_state is not None and \
+                old_state.attributes.get(ATTR_BRIGHTNESS) is not None:
+            # restore also brightness in dimmables devices
+            self._brightness = int(old_state.attributes[ATTR_BRIGHTNESS])
+
     async def async_turn_on(self, **kwargs):
         """Turn the device on and set dim level."""
         if ATTR_BRIGHTNESS in kwargs:
@@ -222,6 +245,7 @@ class HybridRflinkLight(SwitchableRflinkDevice, Light):
         return SUPPORT_BRIGHTNESS
 
 
+# pylint: disable=too-many-ancestors
 class ToggleRflinkLight(SwitchableRflinkDevice, Light):
     """Rflink light device which sends out only 'on' commands.
 
diff --git a/homeassistant/components/light/tellduslive.py b/homeassistant/components/light/tellduslive.py
index 8601fe3cf1f..3f14b34ea78 100644
--- a/homeassistant/components/light/tellduslive.py
+++ b/homeassistant/components/light/tellduslive.py
@@ -8,20 +8,37 @@ https://home-assistant.io/components/light.tellduslive/
 """
 import logging
 
-from homeassistant.components import tellduslive
+from homeassistant.components import light, tellduslive
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS, SUPPORT_BRIGHTNESS, Light)
 from homeassistant.components.tellduslive.entry import TelldusLiveEntity
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 _LOGGER = logging.getLogger(__name__)
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Tellstick Net lights."""
-    if discovery_info is None:
-        return
-    client = hass.data[tellduslive.DOMAIN]
-    add_entities(TelldusLiveLight(client, light) for light in discovery_info)
+    """Old way of setting up TelldusLive.
+
+    Can only be called when a user accidentally mentions the platform in their
+    config. But even in that case it would have been ignored.
+    """
+    pass
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up tellduslive sensors dynamically."""
+    async def async_discover_light(device_id):
+        """Discover and add a discovered sensor."""
+        client = hass.data[tellduslive.DOMAIN]
+        async_add_entities([TelldusLiveLight(client, device_id)])
+
+    async_dispatcher_connect(
+        hass,
+        tellduslive.TELLDUS_DISCOVERY_NEW.format(light.DOMAIN,
+                                                 tellduslive.DOMAIN),
+        async_discover_light,
+    )
 
 
 class TelldusLiveLight(TelldusLiveEntity, Light):
diff --git a/homeassistant/components/light/wemo.py b/homeassistant/components/light/wemo.py
index 55a4836e148..38044b7a736 100644
--- a/homeassistant/components/light/wemo.py
+++ b/homeassistant/components/light/wemo.py
@@ -4,9 +4,12 @@ Support for Belkin WeMo lights.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/light.wemo/
 """
+import asyncio
 import logging
 from datetime import timedelta
+
 import requests
+import async_timeout
 
 from homeassistant import util
 from homeassistant.components.light import (
@@ -74,40 +77,52 @@ class WemoLight(Light):
 
     def __init__(self, device, update_lights):
         """Initialize the WeMo light."""
-        self.light_id = device.name
         self.wemo = device
-        self.update_lights = update_lights
+        self._state = None
+        self._update_lights = update_lights
+        self._available = True
+        self._update_lock = None
+        self._brightness = None
+        self._hs_color = None
+        self._color_temp = None
+        self._is_on = None
+        self._name = self.wemo.name
+        self._unique_id = self.wemo.uniqueID
+
+    async def async_added_to_hass(self):
+        """Wemo light added to HASS."""
+        # Define inside async context so we know our event loop
+        self._update_lock = asyncio.Lock()
 
     @property
     def unique_id(self):
         """Return the ID of this light."""
-        return self.wemo.uniqueID
+        return self._unique_id
 
     @property
     def name(self):
         """Return the name of the light."""
-        return self.wemo.name
+        return self._name
 
     @property
     def brightness(self):
         """Return the brightness of this light between 0..255."""
-        return self.wemo.state.get('level', 255)
+        return self._brightness
 
     @property
     def hs_color(self):
         """Return the hs color values of this light."""
-        xy_color = self.wemo.state.get('color_xy')
-        return color_util.color_xy_to_hs(*xy_color) if xy_color else None
+        return self._hs_color
 
     @property
     def color_temp(self):
         """Return the color temperature of this light in mireds."""
-        return self.wemo.state.get('temperature_mireds')
+        return self._color_temp
 
     @property
     def is_on(self):
         """Return true if device is on."""
-        return self.wemo.state['onoff'] != 0
+        return self._is_on
 
     @property
     def supported_features(self):
@@ -117,7 +132,7 @@ class WemoLight(Light):
     @property
     def available(self):
         """Return if light is available."""
-        return self.wemo.state['available']
+        return self._available
 
     def turn_on(self, **kwargs):
         """Turn the light on."""
@@ -145,9 +160,40 @@ class WemoLight(Light):
         transitiontime = int(kwargs.get(ATTR_TRANSITION, 0))
         self.wemo.turn_off(transition=transitiontime)
 
-    def update(self):
+    def _update(self, force_update=True):
         """Synchronize state with bridge."""
-        self.update_lights(no_throttle=True)
+        self._update_lights(no_throttle=force_update)
+        self._state = self.wemo.state
+
+        self._is_on = self._state.get('onoff') != 0
+        self._brightness = self._state.get('level', 255)
+        self._color_temp = self._state.get('temperature_mireds')
+        self._available = True
+
+        xy_color = self._state.get('color_xy')
+
+        if xy_color:
+            self._hs_color = color_util.color_xy_to_hs(*xy_color)
+        else:
+            self._hs_color = None
+
+    async def async_update(self):
+        """Synchronize state with bridge."""
+        # If an update is in progress, we don't do anything
+        if self._update_lock.locked():
+            return
+
+        try:
+            with async_timeout.timeout(5):
+                await asyncio.shield(self._async_locked_update(True))
+        except asyncio.TimeoutError:
+            _LOGGER.warning('Lost connection to %s', self.name)
+            self._available = False
+
+    async def _async_locked_update(self, force_update):
+        """Try updating within an async lock."""
+        async with self._update_lock:
+            await self.hass.async_add_executor_job(self._update, force_update)
 
 
 class WemoDimmer(Light):
@@ -156,46 +202,79 @@ class WemoDimmer(Light):
     def __init__(self, device):
         """Initialize the WeMo dimmer."""
         self.wemo = device
-        self._brightness = None
         self._state = None
+        self._available = True
+        self._update_lock = None
+        self._brightness = None
+        self._model_name = self.wemo.model_name
+        self._name = self.wemo.name
+        self._serialnumber = self.wemo.serialnumber
+
+    def _subscription_callback(self, _device, _type, _params):
+        """Update the state by the Wemo device."""
+        _LOGGER.debug("Subscription update for %s", self.name)
+        updated = self.wemo.subscription_update(_type, _params)
+        self.hass.add_job(
+            self._async_locked_subscription_callback(not updated))
+
+    async def _async_locked_subscription_callback(self, force_update):
+        """Handle an update from a subscription."""
+        # If an update is in progress, we don't do anything
+        if self._update_lock.locked():
+            return
+
+        await self._async_locked_update(force_update)
+        self.async_schedule_update_ha_state()
 
     async def async_added_to_hass(self):
-        """Register update callback."""
-        wemo = self.hass.components.wemo
-        # The register method uses a threading condition, so call via executor.
-        # and await to wait until the task is done.
-        await self.hass.async_add_job(
-            wemo.SUBSCRIPTION_REGISTRY.register, self.wemo)
-        # The on method just appends to a defaultdict list.
-        wemo.SUBSCRIPTION_REGISTRY.on(self.wemo, None, self._update_callback)
+        """Wemo dimmer added to HASS."""
+        # Define inside async context so we know our event loop
+        self._update_lock = asyncio.Lock()
 
-    def _update_callback(self, _device, _type, _params):
-        """Update the state by the Wemo device."""
-        _LOGGER.debug("Subscription update for  %s", _device)
-        updated = self.wemo.subscription_update(_type, _params)
-        self._update(force_update=(not updated))
-        self.schedule_update_ha_state()
+        registry = self.hass.components.wemo.SUBSCRIPTION_REGISTRY
+        await self.hass.async_add_executor_job(registry.register, self.wemo)
+        registry.on(self.wemo, None, self._subscription_callback)
+
+    async def async_update(self):
+        """Update WeMo state.
+
+        Wemo has an aggressive retry logic that sometimes can take over a
+        minute to return. If we don't get a state after 5 seconds, assume the
+        Wemo dimmer is unreachable. If update goes through, it will be made
+        available again.
+        """
+        # If an update is in progress, we don't do anything
+        if self._update_lock.locked():
+            return
+
+        try:
+            with async_timeout.timeout(5):
+                await asyncio.shield(self._async_locked_update(True))
+        except asyncio.TimeoutError:
+            _LOGGER.warning('Lost connection to %s', self.name)
+            self._available = False
+            self.wemo.reconnect_with_device()
+
+    async def _async_locked_update(self, force_update):
+        """Try updating within an async lock."""
+        async with self._update_lock:
+            await self.hass.async_add_executor_job(self._update, force_update)
 
     @property
     def unique_id(self):
         """Return the ID of this WeMo dimmer."""
-        return self.wemo.serialnumber
+        return self._serialnumber
 
     @property
     def name(self):
         """Return the name of the dimmer if any."""
-        return self.wemo.name
+        return self._name
 
     @property
     def supported_features(self):
         """Flag supported features."""
         return SUPPORT_BRIGHTNESS
 
-    @property
-    def should_poll(self):
-        """No polling needed with subscriptions."""
-        return False
-
     @property
     def brightness(self):
         """Return the brightness of this light between 1 and 100."""
@@ -210,11 +289,17 @@ class WemoDimmer(Light):
         """Update the device state."""
         try:
             self._state = self.wemo.get_state(force_update)
+
             wemobrightness = int(self.wemo.get_brightness(force_update))
             self._brightness = int((wemobrightness * 255) / 100)
+
+            if not self._available:
+                _LOGGER.info('Reconnected to %s', self.name)
+                self._available = True
         except AttributeError as err:
             _LOGGER.warning("Could not update status for %s (%s)",
                             self.name, err)
+            self._available = False
 
     def turn_on(self, **kwargs):
         """Turn the dimmer on."""
@@ -232,3 +317,8 @@ class WemoDimmer(Light):
     def turn_off(self, **kwargs):
         """Turn the dimmer off."""
         self.wemo.off()
+
+    @property
+    def available(self):
+        """Return if dimmer is available."""
+        return self._available
diff --git a/homeassistant/components/light/x10.py b/homeassistant/components/light/x10.py
index ef2211a4469..9618a13a1a9 100644
--- a/homeassistant/components/light/x10.py
+++ b/homeassistant/components/light/x10.py
@@ -41,24 +41,26 @@ def get_unit_status(code):
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the x10 Light platform."""
+    is_cm11a = True
     try:
         x10_command('info')
     except CalledProcessError as err:
-        _LOGGER.error(err.output)
-        return False
+        _LOGGER.info("Assuming that the device is CM17A: %s", err.output)
+        is_cm11a = False
 
-    add_entities(X10Light(light) for light in config[CONF_DEVICES])
+    add_entities(X10Light(light, is_cm11a) for light in config[CONF_DEVICES])
 
 
 class X10Light(Light):
     """Representation of an X10 Light."""
 
-    def __init__(self, light):
+    def __init__(self, light, is_cm11a):
         """Initialize an X10 Light."""
         self._name = light['name']
         self._id = light['id']
         self._brightness = 0
         self._state = False
+        self._is_cm11a = is_cm11a
 
     @property
     def name(self):
@@ -82,15 +84,25 @@ class X10Light(Light):
 
     def turn_on(self, **kwargs):
         """Instruct the light to turn on."""
-        x10_command('on ' + self._id)
+        if self._is_cm11a:
+            x10_command('on ' + self._id)
+        else:
+            x10_command('fon ' + self._id)
         self._brightness = kwargs.get(ATTR_BRIGHTNESS, 255)
         self._state = True
 
     def turn_off(self, **kwargs):
         """Instruct the light to turn off."""
-        x10_command('off ' + self._id)
+        if self._is_cm11a:
+            x10_command('off ' + self._id)
+        else:
+            x10_command('foff ' + self._id)
         self._state = False
 
     def update(self):
         """Fetch update state."""
-        self._state = bool(get_unit_status(self._id))
+        if self._is_cm11a:
+            self._state = bool(get_unit_status(self._id))
+        else:
+            # Not supported on CM17A
+            pass
diff --git a/homeassistant/components/light/xiaomi_miio.py b/homeassistant/components/light/xiaomi_miio.py
index 9e650562fe8..62433ca9f97 100644
--- a/homeassistant/components/light/xiaomi_miio.py
+++ b/homeassistant/components/light/xiaomi_miio.py
@@ -1,5 +1,7 @@
 """
-Support for Xiaomi Philips Lights (LED Ball & Ceiling Lamp, Eyecare Lamp 2).
+Support for Xiaomi Philips Lights.
+
+LED Ball, Candle, Downlight, Ceiling, Eyecare 2, Bedside & Desklamp Lamp.
 
 For more details about this platform, please refer to the documentation
 https://home-assistant.io/components/light.xiaomi_miio/
@@ -19,7 +21,7 @@ from homeassistant.components.light import (
 from homeassistant.const import CONF_HOST, CONF_NAME, CONF_TOKEN
 from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.config_validation as cv
-from homeassistant.util import dt
+from homeassistant.util import color, dt
 
 REQUIREMENTS = ['python-miio==0.4.4', 'construct==2.9.45']
 
@@ -38,6 +40,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
         ['philips.light.sread1',
          'philips.light.ceiling',
          'philips.light.zyceiling',
+         'philips.light.moonlight',
          'philips.light.bulb',
          'philips.light.candle',
          'philips.light.candle2',
@@ -63,6 +66,13 @@ ATTR_AUTOMATIC_COLOR_TEMPERATURE = 'automatic_color_temperature'
 ATTR_REMINDER = 'reminder'
 ATTR_EYECARE_MODE = 'eyecare_mode'
 
+# Moonlight
+ATTR_SLEEP_ASSISTANT = 'sleep_assistant'
+ATTR_SLEEP_OFF_TIME = 'sleep_off_time'
+ATTR_TOTAL_ASSISTANT_SLEEP_TIME = 'total_assistant_sleep_time'
+ATTR_BRAND_SLEEP = 'brand_sleep'
+ATTR_BRAND = 'brand'
+
 SERVICE_SET_SCENE = 'xiaomi_miio_set_scene'
 SERVICE_SET_DELAYED_TURN_OFF = 'xiaomi_miio_set_delayed_turn_off'
 SERVICE_REMINDER_ON = 'xiaomi_miio_reminder_on'
@@ -151,6 +161,12 @@ async def async_setup_platform(hass, config, async_add_entities,
         device = XiaomiPhilipsCeilingLamp(name, light, model, unique_id)
         devices.append(device)
         hass.data[DATA_KEY][host] = device
+    elif model == 'philips.light.moonlight':
+        from miio import PhilipsMoonlight
+        light = PhilipsMoonlight(host, token)
+        device = XiaomiPhilipsMoonlightLamp(name, light, model, unique_id)
+        devices.append(device)
+        hass.data[DATA_KEY][host] = device
     elif model in ['philips.light.bulb',
                    'philips.light.candle',
                    'philips.light.candle2',
@@ -307,15 +323,15 @@ class XiaomiPhilipsAbstractLight(Light):
         from miio import DeviceException
         try:
             state = await self.hass.async_add_executor_job(self._light.status)
-            _LOGGER.debug("Got new state: %s", state)
-
-            self._available = True
-            self._state = state.is_on
-            self._brightness = ceil((255 / 100.0) * state.brightness)
-
         except DeviceException as ex:
             self._available = False
             _LOGGER.error("Got exception while fetching the state: %s", ex)
+            return
+
+        _LOGGER.debug("Got new state: %s", state)
+        self._available = True
+        self._state = state.is_on
+        self._brightness = ceil((255 / 100.0) * state.brightness)
 
 
 class XiaomiPhilipsGenericLight(XiaomiPhilipsAbstractLight):
@@ -335,25 +351,25 @@ class XiaomiPhilipsGenericLight(XiaomiPhilipsAbstractLight):
         from miio import DeviceException
         try:
             state = await self.hass.async_add_executor_job(self._light.status)
-            _LOGGER.debug("Got new state: %s", state)
-
-            self._available = True
-            self._state = state.is_on
-            self._brightness = ceil((255 / 100.0) * state.brightness)
-
-            delayed_turn_off = self.delayed_turn_off_timestamp(
-                state.delay_off_countdown,
-                dt.utcnow(),
-                self._state_attrs[ATTR_DELAYED_TURN_OFF])
-
-            self._state_attrs.update({
-                ATTR_SCENE: state.scene,
-                ATTR_DELAYED_TURN_OFF: delayed_turn_off,
-            })
-
         except DeviceException as ex:
             self._available = False
             _LOGGER.error("Got exception while fetching the state: %s", ex)
+            return
+
+        _LOGGER.debug("Got new state: %s", state)
+        self._available = True
+        self._state = state.is_on
+        self._brightness = ceil((255 / 100.0) * state.brightness)
+
+        delayed_turn_off = self.delayed_turn_off_timestamp(
+            state.delay_off_countdown,
+            dt.utcnow(),
+            self._state_attrs[ATTR_DELAYED_TURN_OFF])
+
+        self._state_attrs.update({
+            ATTR_SCENE: state.scene,
+            ATTR_DELAYED_TURN_OFF: delayed_turn_off,
+        })
 
     async def async_set_scene(self, scene: int = 1):
         """Set the fixed scene."""
@@ -485,29 +501,29 @@ class XiaomiPhilipsBulb(XiaomiPhilipsGenericLight):
         from miio import DeviceException
         try:
             state = await self.hass.async_add_executor_job(self._light.status)
-            _LOGGER.debug("Got new state: %s", state)
-
-            self._available = True
-            self._state = state.is_on
-            self._brightness = ceil((255 / 100.0) * state.brightness)
-            self._color_temp = self.translate(
-                state.color_temperature,
-                CCT_MIN, CCT_MAX,
-                self.max_mireds, self.min_mireds)
-
-            delayed_turn_off = self.delayed_turn_off_timestamp(
-                state.delay_off_countdown,
-                dt.utcnow(),
-                self._state_attrs[ATTR_DELAYED_TURN_OFF])
-
-            self._state_attrs.update({
-                ATTR_SCENE: state.scene,
-                ATTR_DELAYED_TURN_OFF: delayed_turn_off,
-            })
-
         except DeviceException as ex:
             self._available = False
             _LOGGER.error("Got exception while fetching the state: %s", ex)
+            return
+
+        _LOGGER.debug("Got new state: %s", state)
+        self._available = True
+        self._state = state.is_on
+        self._brightness = ceil((255 / 100.0) * state.brightness)
+        self._color_temp = self.translate(
+            state.color_temperature,
+            CCT_MIN, CCT_MAX,
+            self.max_mireds, self.min_mireds)
+
+        delayed_turn_off = self.delayed_turn_off_timestamp(
+            state.delay_off_countdown,
+            dt.utcnow(),
+            self._state_attrs[ATTR_DELAYED_TURN_OFF])
+
+        self._state_attrs.update({
+            ATTR_SCENE: state.scene,
+            ATTR_DELAYED_TURN_OFF: delayed_turn_off,
+        })
 
     @staticmethod
     def translate(value, left_min, left_max, right_min, right_max):
@@ -545,32 +561,32 @@ class XiaomiPhilipsCeilingLamp(XiaomiPhilipsBulb):
         from miio import DeviceException
         try:
             state = await self.hass.async_add_executor_job(self._light.status)
-            _LOGGER.debug("Got new state: %s", state)
-
-            self._available = True
-            self._state = state.is_on
-            self._brightness = ceil((255 / 100.0) * state.brightness)
-            self._color_temp = self.translate(
-                state.color_temperature,
-                CCT_MIN, CCT_MAX,
-                self.max_mireds, self.min_mireds)
-
-            delayed_turn_off = self.delayed_turn_off_timestamp(
-                state.delay_off_countdown,
-                dt.utcnow(),
-                self._state_attrs[ATTR_DELAYED_TURN_OFF])
-
-            self._state_attrs.update({
-                ATTR_SCENE: state.scene,
-                ATTR_DELAYED_TURN_OFF: delayed_turn_off,
-                ATTR_NIGHT_LIGHT_MODE: state.smart_night_light,
-                ATTR_AUTOMATIC_COLOR_TEMPERATURE:
-                    state.automatic_color_temperature,
-            })
-
         except DeviceException as ex:
             self._available = False
             _LOGGER.error("Got exception while fetching the state: %s", ex)
+            return
+
+        _LOGGER.debug("Got new state: %s", state)
+        self._available = True
+        self._state = state.is_on
+        self._brightness = ceil((255 / 100.0) * state.brightness)
+        self._color_temp = self.translate(
+            state.color_temperature,
+            CCT_MIN, CCT_MAX,
+            self.max_mireds, self.min_mireds)
+
+        delayed_turn_off = self.delayed_turn_off_timestamp(
+            state.delay_off_countdown,
+            dt.utcnow(),
+            self._state_attrs[ATTR_DELAYED_TURN_OFF])
+
+        self._state_attrs.update({
+            ATTR_SCENE: state.scene,
+            ATTR_DELAYED_TURN_OFF: delayed_turn_off,
+            ATTR_NIGHT_LIGHT_MODE: state.smart_night_light,
+            ATTR_AUTOMATIC_COLOR_TEMPERATURE:
+                state.automatic_color_temperature,
+        })
 
 
 class XiaomiPhilipsEyecareLamp(XiaomiPhilipsGenericLight):
@@ -591,28 +607,28 @@ class XiaomiPhilipsEyecareLamp(XiaomiPhilipsGenericLight):
         from miio import DeviceException
         try:
             state = await self.hass.async_add_executor_job(self._light.status)
-            _LOGGER.debug("Got new state: %s", state)
-
-            self._available = True
-            self._state = state.is_on
-            self._brightness = ceil((255 / 100.0) * state.brightness)
-
-            delayed_turn_off = self.delayed_turn_off_timestamp(
-                state.delay_off_countdown,
-                dt.utcnow(),
-                self._state_attrs[ATTR_DELAYED_TURN_OFF])
-
-            self._state_attrs.update({
-                ATTR_SCENE: state.scene,
-                ATTR_DELAYED_TURN_OFF: delayed_turn_off,
-                ATTR_REMINDER: state.reminder,
-                ATTR_NIGHT_LIGHT_MODE: state.smart_night_light,
-                ATTR_EYECARE_MODE: state.eyecare,
-            })
-
         except DeviceException as ex:
             self._available = False
             _LOGGER.error("Got exception while fetching the state: %s", ex)
+            return
+
+        _LOGGER.debug("Got new state: %s", state)
+        self._available = True
+        self._state = state.is_on
+        self._brightness = ceil((255 / 100.0) * state.brightness)
+
+        delayed_turn_off = self.delayed_turn_off_timestamp(
+            state.delay_off_countdown,
+            dt.utcnow(),
+            self._state_attrs[ATTR_DELAYED_TURN_OFF])
+
+        self._state_attrs.update({
+            ATTR_SCENE: state.scene,
+            ATTR_DELAYED_TURN_OFF: delayed_turn_off,
+            ATTR_REMINDER: state.reminder,
+            ATTR_NIGHT_LIGHT_MODE: state.smart_night_light,
+            ATTR_EYECARE_MODE: state.eyecare,
+        })
 
     async def async_set_delayed_turn_off(self, time_period: timedelta):
         """Set delayed turn off."""
@@ -719,12 +735,84 @@ class XiaomiPhilipsEyecareLampAmbientLight(XiaomiPhilipsAbstractLight):
         from miio import DeviceException
         try:
             state = await self.hass.async_add_executor_job(self._light.status)
-            _LOGGER.debug("Got new state: %s", state)
-
-            self._available = True
-            self._state = state.ambient
-            self._brightness = ceil((255 / 100.0) * state.ambient_brightness)
-
         except DeviceException as ex:
             self._available = False
             _LOGGER.error("Got exception while fetching the state: %s", ex)
+            return
+
+        _LOGGER.debug("Got new state: %s", state)
+        self._available = True
+        self._state = state.ambient
+        self._brightness = ceil((255 / 100.0) * state.ambient_brightness)
+
+
+class XiaomiPhilipsMoonlightLamp(XiaomiPhilipsBulb):
+    """Representation of a Xiaomi Philips Zhirui Bedside Lamp."""
+
+    def __init__(self, name, light, model, unique_id):
+        """Initialize the light device."""
+        super().__init__(name, light, model, unique_id)
+
+        self._hs_color = None
+        self._state_attrs.pop(ATTR_DELAYED_TURN_OFF)
+        self._state_attrs.update({
+            ATTR_SLEEP_ASSISTANT: None,
+            ATTR_SLEEP_OFF_TIME: None,
+            ATTR_TOTAL_ASSISTANT_SLEEP_TIME: None,
+            ATTR_BRAND_SLEEP: None,
+            ATTR_BRAND: None,
+        })
+
+    @property
+    def min_mireds(self):
+        """Return the coldest color_temp that this light supports."""
+        return 153
+
+    @property
+    def max_mireds(self):
+        """Return the warmest color_temp that this light supports."""
+        return 588
+
+    @property
+    def hs_color(self) -> tuple:
+        """Return the hs color value."""
+        return self._hs_color
+
+    @property
+    def supported_features(self):
+        """Return the supported features."""
+        return SUPPORT_BRIGHTNESS | SUPPORT_COLOR_TEMP
+
+    async def async_update(self):
+        """Fetch state from the device."""
+        from miio import DeviceException
+        try:
+            state = await self.hass.async_add_executor_job(self._light.status)
+        except DeviceException as ex:
+            self._available = False
+            _LOGGER.error("Got exception while fetching the state: %s", ex)
+            return
+
+        _LOGGER.debug("Got new state: %s", state)
+        self._available = True
+        self._state = state.is_on
+        self._brightness = ceil((255 / 100.0) * state.brightness)
+        self._color_temp = self.translate(
+            state.color_temperature,
+            CCT_MIN, CCT_MAX,
+            self.max_mireds, self.min_mireds)
+        self._hs_color = color.color_RGB_to_hs(*state.rgb)
+
+        self._state_attrs.update({
+            ATTR_SCENE: state.scene,
+            ATTR_SLEEP_ASSISTANT: state.sleep_assistant,
+            ATTR_SLEEP_OFF_TIME: state.sleep_off_time,
+            ATTR_TOTAL_ASSISTANT_SLEEP_TIME:
+                state.total_assistant_sleep_time,
+            ATTR_BRAND_SLEEP: state.brand_sleep,
+            ATTR_BRAND: state.brand,
+        })
+
+    async def async_set_delayed_turn_off(self, time_period: timedelta):
+        """Set delayed turn off. Unsupported."""
+        return
diff --git a/homeassistant/components/light/zha.py b/homeassistant/components/light/zha.py
index 83448b39d9e..5b06e8fa321 100644
--- a/homeassistant/components/light/zha.py
+++ b/homeassistant/components/light/zha.py
@@ -9,8 +9,12 @@ import logging
 from homeassistant.components import light
 from homeassistant.components.zha import helpers
 from homeassistant.components.zha.const import (
-    DATA_ZHA, DATA_ZHA_DISPATCHERS, ZHA_DISCOVERY_NEW)
+    DATA_ZHA, DATA_ZHA_DISPATCHERS, REPORT_CONFIG_ASAP, REPORT_CONFIG_DEFAULT,
+    REPORT_CONFIG_IMMEDIATE, ZHA_DISCOVERY_NEW)
 from homeassistant.components.zha.entities import ZhaEntity
+from homeassistant.components.zha.entities.listeners import (
+    OnOffListener, LevelListener
+)
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 import homeassistant.util.color as color_util
 
@@ -73,7 +77,9 @@ async def _async_setup_entities(hass, config_entry, async_add_entities,
                         UNSUPPORTED_ATTRIBUTE):
                     discovery_info['color_capabilities'] |= \
                         CAPABILITIES_COLOR_TEMP
-        entities.append(Light(**discovery_info))
+
+        zha_light = Light(**discovery_info)
+        entities.append(zha_light)
 
     async_add_entities(entities, update_before_add=True)
 
@@ -90,12 +96,25 @@ class Light(ZhaEntity, light.Light):
         self._color_temp = None
         self._hs_color = None
         self._brightness = None
+        from zigpy.zcl.clusters.general import OnOff, LevelControl
+        self._in_listeners = {
+            OnOff.cluster_id: OnOffListener(
+                self,
+                self._in_clusters[OnOff.cluster_id]
+            ),
+        }
 
-        import zigpy.zcl.clusters as zcl_clusters
-        if zcl_clusters.general.LevelControl.cluster_id in self._in_clusters:
+        if LevelControl.cluster_id in self._in_clusters:
             self._supported_features |= light.SUPPORT_BRIGHTNESS
             self._supported_features |= light.SUPPORT_TRANSITION
             self._brightness = 0
+            self._in_listeners.update({
+                LevelControl.cluster_id: LevelListener(
+                    self,
+                    self._in_clusters[LevelControl.cluster_id]
+                )
+            })
+        import zigpy.zcl.clusters as zcl_clusters
         if zcl_clusters.lighting.Color.cluster_id in self._in_clusters:
             color_capabilities = kwargs['color_capabilities']
             if color_capabilities & CAPABILITIES_COLOR_TEMP:
@@ -105,6 +124,19 @@ class Light(ZhaEntity, light.Light):
                 self._supported_features |= light.SUPPORT_COLOR
                 self._hs_color = (0, 0)
 
+    @property
+    def zcl_reporting_config(self) -> dict:
+        """Return attribute reporting configuration."""
+        return {
+            'on_off': {'on_off': REPORT_CONFIG_IMMEDIATE},
+            'level': {'current_level': REPORT_CONFIG_ASAP},
+            'light_color': {
+                'current_x': REPORT_CONFIG_DEFAULT,
+                'current_y': REPORT_CONFIG_DEFAULT,
+                'color_temperature': REPORT_CONFIG_DEFAULT,
+            }
+        }
+
     @property
     def is_on(self) -> bool:
         """Return true if entity is on."""
@@ -112,6 +144,11 @@ class Light(ZhaEntity, light.Light):
             return False
         return bool(self._state)
 
+    def set_state(self, state):
+        """Set the state."""
+        self._state = state
+        self.async_schedule_update_ha_state()
+
     async def async_turn_on(self, **kwargs):
         """Turn the entity on."""
         from zigpy.exceptions import DeliveryError
@@ -181,8 +218,15 @@ class Light(ZhaEntity, light.Light):
     async def async_turn_off(self, **kwargs):
         """Turn the entity off."""
         from zigpy.exceptions import DeliveryError
+        duration = kwargs.get(light.ATTR_TRANSITION)
         try:
-            res = await self._endpoint.on_off.off()
+            supports_level = self.supported_features & light.SUPPORT_BRIGHTNESS
+            if duration and supports_level:
+                res = await self._endpoint.level.move_to_level_with_on_off(
+                    0, duration*10
+                )
+            else:
+                res = await self._endpoint.on_off.off()
             _LOGGER.debug("%s was turned off: %s", self.entity_id, res)
         except DeliveryError as ex:
             _LOGGER.error("%s: Unable to turn the light off: %s",
@@ -197,6 +241,13 @@ class Light(ZhaEntity, light.Light):
         """Return the brightness of this light between 0..255."""
         return self._brightness
 
+    def set_level(self, value):
+        """Set the brightness of this light between 0..255."""
+        if value < 0 or value > 255:
+            return
+        self._brightness = value
+        self.async_schedule_update_ha_state()
+
     @property
     def hs_color(self):
         """Return the hs color value [int, int]."""
@@ -249,11 +300,3 @@ class Light(ZhaEntity, light.Light):
                 xy_color = (round(result['current_x']/65535, 3),
                             round(result['current_y']/65535, 3))
                 self._hs_color = color_util.color_xy_to_hs(*xy_color)
-
-    @property
-    def should_poll(self) -> bool:
-        """Return True if entity has to be polled for state.
-
-        False if entity pushes its state to HA.
-        """
-        return False
diff --git a/homeassistant/components/light/zwave.py b/homeassistant/components/light/zwave.py
index 09f3709f216..da712a2f183 100644
--- a/homeassistant/components/light/zwave.py
+++ b/homeassistant/components/light/zwave.py
@@ -19,20 +19,31 @@ import homeassistant.util.color as color_util
 
 _LOGGER = logging.getLogger(__name__)
 
-AEOTEC = 0x86
-AEOTEC_ZW098_LED_BULB = 0x62
-AEOTEC_ZW098_LED_BULB_LIGHT = (AEOTEC, AEOTEC_ZW098_LED_BULB)
-
 COLOR_CHANNEL_WARM_WHITE = 0x01
 COLOR_CHANNEL_COLD_WHITE = 0x02
 COLOR_CHANNEL_RED = 0x04
 COLOR_CHANNEL_GREEN = 0x08
 COLOR_CHANNEL_BLUE = 0x10
 
+# Some bulbs have an independent warm and cool white light LEDs. These need
+# to be treated differently, aka the zw098 workaround. Ensure these are added
+# to DEVICE_MAPPINGS below.
+# (Manufacturer ID, Product ID) from
+# https://github.com/OpenZWave/open-zwave/blob/master/config/manufacturer_specific.xml
+AEOTEC_ZW098_LED_BULB_LIGHT = (0x86, 0x62)
+AEOTEC_ZWA001_LED_BULB_LIGHT = (0x371, 0x1)
+AEOTEC_ZWA002_LED_BULB_LIGHT = (0x371, 0x2)
+HANK_HKZW_RGB01_LED_BULB_LIGHT = (0x208, 0x4)
+ZIPATO_RGB_BULB_2_LED_BULB_LIGHT = (0x131, 0x3)
+
 WORKAROUND_ZW098 = 'zw098'
 
 DEVICE_MAPPINGS = {
-    AEOTEC_ZW098_LED_BULB_LIGHT: WORKAROUND_ZW098
+    AEOTEC_ZW098_LED_BULB_LIGHT: WORKAROUND_ZW098,
+    AEOTEC_ZWA001_LED_BULB_LIGHT: WORKAROUND_ZW098,
+    AEOTEC_ZWA002_LED_BULB_LIGHT: WORKAROUND_ZW098,
+    HANK_HKZW_RGB01_LED_BULB_LIGHT: WORKAROUND_ZW098,
+    ZIPATO_RGB_BULB_2_LED_BULB_LIGHT: WORKAROUND_ZW098
 }
 
 # Generate midpoint color temperatures for bulbs that have limited
diff --git a/homeassistant/components/lock/__init__.py b/homeassistant/components/lock/__init__.py
index 22923602dc2..72e87f763d2 100644
--- a/homeassistant/components/lock/__init__.py
+++ b/homeassistant/components/lock/__init__.py
@@ -34,7 +34,7 @@ GROUP_NAME_ALL_LOCKS = 'all locks'
 MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10)
 
 LOCK_SERVICE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Optional(ATTR_CODE): cv.string,
 })
 
diff --git a/homeassistant/components/lock/mqtt.py b/homeassistant/components/lock/mqtt.py
index 28849c88159..ad5ba34dbb0 100644
--- a/homeassistant/components/lock/mqtt.py
+++ b/homeassistant/components/lock/mqtt.py
@@ -11,11 +11,12 @@ import voluptuous as vol
 from homeassistant.core import callback
 from homeassistant.components.lock import LockDevice
 from homeassistant.components.mqtt import (
-    ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC,
-    CONF_COMMAND_TOPIC, CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE,
-    CONF_QOS, CONF_RETAIN, MqttAvailability, MqttDiscoveryUpdate)
+    ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_COMMAND_TOPIC,
+    CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, CONF_RETAIN,
+    CONF_STATE_TOPIC, MqttAvailability, MqttDiscoveryUpdate,
+    MqttEntityDeviceInfo)
 from homeassistant.const import (
-    CONF_NAME, CONF_OPTIMISTIC, CONF_VALUE_TEMPLATE)
+    CONF_DEVICE, CONF_NAME, CONF_OPTIMISTIC, CONF_VALUE_TEMPLATE)
 from homeassistant.components import mqtt, lock
 from homeassistant.components.mqtt.discovery import MQTT_DISCOVERY_NEW
 import homeassistant.helpers.config_validation as cv
@@ -26,6 +27,7 @@ _LOGGER = logging.getLogger(__name__)
 
 CONF_PAYLOAD_LOCK = 'payload_lock'
 CONF_PAYLOAD_UNLOCK = 'payload_unlock'
+CONF_UNIQUE_ID = 'unique_id'
 
 DEFAULT_NAME = 'MQTT Lock'
 DEFAULT_OPTIMISTIC = False
@@ -40,6 +42,8 @@ PLATFORM_SCHEMA = mqtt.MQTT_RW_PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_PAYLOAD_UNLOCK, default=DEFAULT_PAYLOAD_UNLOCK):
         cv.string,
     vol.Optional(CONF_OPTIMISTIC, default=DEFAULT_OPTIMISTIC): cv.boolean,
+    vol.Optional(CONF_UNIQUE_ID): cv.string,
+    vol.Optional(CONF_DEVICE): mqtt.MQTT_ENTITY_DEVICE_INFO_SCHEMA,
 }).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
 
 
@@ -82,21 +86,25 @@ async def _async_setup_entity(hass, config, async_add_entities,
         config.get(CONF_AVAILABILITY_TOPIC),
         config.get(CONF_PAYLOAD_AVAILABLE),
         config.get(CONF_PAYLOAD_NOT_AVAILABLE),
+        config.get(CONF_UNIQUE_ID),
+        config.get(CONF_DEVICE),
         discovery_hash,
     )])
 
 
-class MqttLock(MqttAvailability, MqttDiscoveryUpdate, LockDevice):
+class MqttLock(MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo,
+               LockDevice):
     """Representation of a lock that can be toggled using MQTT."""
 
     def __init__(self, name, state_topic, command_topic, qos, retain,
                  payload_lock, payload_unlock, optimistic, value_template,
                  availability_topic, payload_available, payload_not_available,
-                 discovery_hash):
+                 unique_id, device_config, discovery_hash):
         """Initialize the lock."""
         MqttAvailability.__init__(self, availability_topic, qos,
                                   payload_available, payload_not_available)
         MqttDiscoveryUpdate.__init__(self, discovery_hash)
+        MqttEntityDeviceInfo.__init__(self, device_config)
         self._state = False
         self._name = name
         self._state_topic = state_topic
@@ -108,6 +116,7 @@ class MqttLock(MqttAvailability, MqttDiscoveryUpdate, LockDevice):
         self._optimistic = optimistic
         self._template = value_template
         self._discovery_hash = discovery_hash
+        self._unique_id = unique_id
 
     async def async_added_to_hass(self):
         """Subscribe to MQTT events."""
@@ -143,6 +152,11 @@ class MqttLock(MqttAvailability, MqttDiscoveryUpdate, LockDevice):
         """Return the name of the lock."""
         return self._name
 
+    @property
+    def unique_id(self):
+        """Return a unique ID."""
+        return self._unique_id
+
     @property
     def is_locked(self):
         """Return true if lock is locked."""
diff --git a/homeassistant/components/luftdaten/.translations/ca.json b/homeassistant/components/luftdaten/.translations/ca.json
index 1254b41bddf..b00c1b2e3e3 100644
--- a/homeassistant/components/luftdaten/.translations/ca.json
+++ b/homeassistant/components/luftdaten/.translations/ca.json
@@ -8,10 +8,10 @@
         "step": {
             "user": {
                 "data": {
-                    "show_on_map": "Mostra al mapa",
+                    "show_on_map": "Mostrar al mapa",
                     "station_id": "Identificador del sensor Luftdaten"
                 },
-                "title": "Crear Luftdaten"
+                "title": "Configuraci\u00f3 de Luftdaten"
             }
         },
         "title": "Luftdaten"
diff --git a/homeassistant/components/lutron.py b/homeassistant/components/lutron.py
index 2e49d7ce690..7f1e1d25ae1 100644
--- a/homeassistant/components/lutron.py
+++ b/homeassistant/components/lutron.py
@@ -13,7 +13,7 @@ from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers import discovery
 from homeassistant.helpers.entity import Entity
 
-REQUIREMENTS = ['pylutron==0.1.0']
+REQUIREMENTS = ['pylutron==0.2.0']
 
 DOMAIN = 'lutron'
 
@@ -36,7 +36,10 @@ def setup(hass, base_config):
     from pylutron import Lutron
 
     hass.data[LUTRON_CONTROLLER] = None
-    hass.data[LUTRON_DEVICES] = {'light': [], 'cover': []}
+    hass.data[LUTRON_DEVICES] = {'light': [],
+                                 'cover': [],
+                                 'switch': [],
+                                 'scene': []}
 
     config = base_config.get(DOMAIN)
     hass.data[LUTRON_CONTROLLER] = Lutron(
@@ -51,10 +54,23 @@ def setup(hass, base_config):
         for output in area.outputs:
             if output.type == 'SYSTEM_SHADE':
                 hass.data[LUTRON_DEVICES]['cover'].append((area.name, output))
-            else:
+            elif output.is_dimmable:
                 hass.data[LUTRON_DEVICES]['light'].append((area.name, output))
+            else:
+                hass.data[LUTRON_DEVICES]['switch'].append((area.name, output))
+        for keypad in area.keypads:
+            for button in keypad.buttons:
+                # This is the best way to determine if a button does anything
+                # useful until pylutron is updated to provide information on
+                # which buttons actually control scenes.
+                for led in keypad.leds:
+                    if (led.number == button.number and
+                            button.name != 'Unknown Button' and
+                            button.button_type in ('SingleAction', 'Toggle')):
+                        hass.data[LUTRON_DEVICES]['scene'].append(
+                            (area.name, keypad.name, button, led))
 
-    for component in ('light', 'cover'):
+    for component in ('light', 'cover', 'switch', 'scene'):
         discovery.load_platform(hass, component, DOMAIN, None, base_config)
     return True
 
@@ -70,12 +86,13 @@ class LutronDevice(Entity):
 
     async def async_added_to_hass(self):
         """Register callbacks."""
-        self.hass.async_add_job(
-            self._controller.subscribe, self._lutron_device,
-            self._update_callback
+        self.hass.async_add_executor_job(
+            self._lutron_device.subscribe,
+            self._update_callback,
+            None
         )
 
-    def _update_callback(self, _device):
+    def _update_callback(self, _device, _context, _event, _params):
         """Run when invoked by pylutron when the device state changes."""
         self.schedule_update_ha_state()
 
diff --git a/homeassistant/components/mailgun/.translations/ca.json b/homeassistant/components/mailgun/.translations/ca.json
index fcb087e6885..f43467de7d9 100644
--- a/homeassistant/components/mailgun/.translations/ca.json
+++ b/homeassistant/components/mailgun/.translations/ca.json
@@ -1,16 +1,16 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "La vostra inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de Mailgun.",
+            "not_internet_accessible": "La inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de Mailgun.",
             "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
         },
         "create_entry": {
-            "default": "Per enviar esdeveniments a Home Assistant, haureu de configurar [Webhooks amb Mailgun]({mailgun_url}). \n\n Ompliu la informaci\u00f3 seg\u00fcent: \n\n - URL: `{webhook_url}` \n - M\u00e8tode: POST \n - Tipus de contingut: application/x-www-form-urlencoded\n\nVegeu [la documentaci\u00f3]({docs_url}) sobre com configurar els automatismes per gestionar les dades entrants."
+            "default": "Per enviar esdeveniments a Home Assistant, haur\u00e0s de configurar [Webhooks amb Mailgun]({mailgun_url}). \n\nCompleta la seg\u00fcent informaci\u00f3: \n\n- URL: `{webhook_url}` \n- M\u00e8tode: POST \n- Tipus de contingut: application/x-www-form-urlencoded\n\nConsulta la [documentaci\u00f3]({docs_url}) sobre com configurar els automatismes per gestionar dades entrants."
         },
         "step": {
             "user": {
-                "description": "Esteu segur que voleu configurar Mailgun?",
-                "title": "Configureu el Webhook de Mailgun"
+                "description": "Est\u00e0s segur que vols configurar Mailgun?",
+                "title": "Configuraci\u00f3 del Webhook de Mailgun"
             }
         },
         "title": "Mailgun"
diff --git a/homeassistant/components/mailgun/.translations/hu.json b/homeassistant/components/mailgun/.translations/hu.json
new file mode 100644
index 00000000000..975c106a26f
--- /dev/null
+++ b/homeassistant/components/mailgun/.translations/hu.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "abort": {
+            "not_internet_accessible": "A Home Assistant rendszerednek el\u00e9rhet\u0151nek kell lennie az internetr\u0151l a Mailgun \u00fczenetek fogad\u00e1s\u00e1hoz.",
+            "one_instance_allowed": "Csak egyetlen konfigur\u00e1ci\u00f3 sz\u00fcks\u00e9ges."
+        },
+        "step": {
+            "user": {
+                "description": "Biztosan be szeretn\u00e9d \u00e1ll\u00edtani a Mailgunt?",
+                "title": "Mailgun Webhook be\u00e1ll\u00edt\u00e1sa"
+            }
+        },
+        "title": "Mailgun"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/mailgun/.translations/no.json b/homeassistant/components/mailgun/.translations/no.json
index e1254910542..91c616b69af 100644
--- a/homeassistant/components/mailgun/.translations/no.json
+++ b/homeassistant/components/mailgun/.translations/no.json
@@ -5,7 +5,7 @@
             "one_instance_allowed": "Kun \u00e9n enkelt forekomst er n\u00f8dvendig."
         },
         "create_entry": {
-            "default": "For \u00e5 sende hendelser til Home Assistant, m\u00e5 du sette opp [Webhooks with Mailgun]({mailgun_url}).\n\nFyll ut f\u00f8lgende informasjon:\n\n- URL: `{webhook_url}`\n- Metode: POST\n- Innholdstype: application/x-www-form-urlencoded\n\nSe [dokumentasjonen]({docs_url}) om hvordan du konfigurerer automatiseringer for \u00e5 h\u00e5ndtere innkommende data."
+            "default": "For \u00e5 sende hendelser til Home Assistant, m\u00e5 du sette opp [Webhooks with Mailgun]({mailgun_url}).\n\nFyll ut f\u00f8lgende informasjon:\n\n- URL: `{webhook_url}`\n- Metode: POST\n- Innholdstype: application/json\n\nSe [dokumentasjonen]({docs_url}) om hvordan du konfigurerer automatiseringer for \u00e5 h\u00e5ndtere innkommende data."
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/media_extractor.py b/homeassistant/components/media_extractor.py
index 296c6c8d75d..749935fda2b 100644
--- a/homeassistant/components/media_extractor.py
+++ b/homeassistant/components/media_extractor.py
@@ -14,7 +14,7 @@ from homeassistant.components.media_player import (
     SERVICE_PLAY_MEDIA)
 from homeassistant.helpers import config_validation as cv
 
-REQUIREMENTS = ['youtube_dl==2018.11.23']
+REQUIREMENTS = ['youtube_dl==2018.12.17']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/media_player/__init__.py b/homeassistant/components/media_player/__init__.py
index 8530a01d3e6..cd109cce7d3 100644
--- a/homeassistant/components/media_player/__init__.py
+++ b/homeassistant/components/media_player/__init__.py
@@ -117,7 +117,7 @@ SUPPORT_SELECT_SOUND_MODE = 65536
 
 # Service call validation schemas
 MEDIA_PLAYER_SCHEMA = vol.Schema({
-    ATTR_ENTITY_ID: cv.entity_ids,
+    ATTR_ENTITY_ID: cv.comp_entity_ids,
 })
 
 MEDIA_PLAYER_SET_VOLUME_SCHEMA = MEDIA_PLAYER_SCHEMA.extend({
diff --git a/homeassistant/components/media_player/bluesound.py b/homeassistant/components/media_player/bluesound.py
index f4ed62b15cd..998f559bc8a 100644
--- a/homeassistant/components/media_player/bluesound.py
+++ b/homeassistant/components/media_player/bluesound.py
@@ -779,7 +779,7 @@ class BluesoundPlayer(MediaPlayerDevice):
     @property
     def shuffle(self):
         """Return true if shuffle is active."""
-        return True if self._status.get('shuffle', '0') == '1' else False
+        return self._status.get('shuffle', '0') == '1'
 
     async def async_join(self, master):
         """Join the player to a group."""
diff --git a/homeassistant/components/media_player/directv.py b/homeassistant/components/media_player/directv.py
index d8c67e372b2..707014328c6 100644
--- a/homeassistant/components/media_player/directv.py
+++ b/homeassistant/components/media_player/directv.py
@@ -133,6 +133,7 @@ class DirecTvDevice(MediaPlayerDevice):
         self._is_client = device != '0'
         self._assumed_state = None
         self._available = False
+        self._first_error_timestamp = None
 
         if self._is_client:
             _LOGGER.debug("Created DirecTV client %s for device %s",
@@ -142,7 +143,7 @@ class DirecTvDevice(MediaPlayerDevice):
 
     def update(self):
         """Retrieve latest state."""
-        _LOGGER.debug("Updating status for %s", self._name)
+        _LOGGER.debug("%s: Updating status", self.entity_id)
         try:
             self._available = True
             self._is_standby = self.dtv.get_standby()
@@ -156,6 +157,7 @@ class DirecTvDevice(MediaPlayerDevice):
             else:
                 self._current = self.dtv.get_tuned()
                 if self._current['status']['code'] == 200:
+                    self._first_error_timestamp = None
                     self._is_recorded = self._current.get('uniqueId')\
                         is not None
                     self._paused = self._last_position == \
@@ -165,15 +167,41 @@ class DirecTvDevice(MediaPlayerDevice):
                     self._last_update = dt_util.utcnow() if not self._paused \
                         or self._last_update is None else self._last_update
                 else:
-                    self._available = False
+                    # If an error is received then only set to unavailable if
+                    # this started at least 1 minute ago.
+                    log_message = "{}: Invalid status {} received".format(
+                        self.entity_id,
+                        self._current['status']['code']
+                    )
+                    if self._check_state_available():
+                        _LOGGER.debug(log_message)
+                    else:
+                        _LOGGER.error(log_message)
+
         except requests.RequestException as ex:
-            _LOGGER.error("Request error trying to update current status for"
-                          " %s. %s", self._name, ex)
-            self._available = False
-        except Exception:
+            _LOGGER.error("%s: Request error trying to update current status: "
+                          "%s", self.entity_id, ex)
+            self._check_state_available()
+
+        except Exception as ex:
+            _LOGGER.error("%s: Exception trying to update current status: %s",
+                          self.entity_id, ex)
             self._available = False
+            if not self._first_error_timestamp:
+                self._first_error_timestamp = dt_util.utcnow()
             raise
 
+    def _check_state_available(self):
+        """Set to unavailable if issue been occurring over 1 minute."""
+        if not self._first_error_timestamp:
+            self._first_error_timestamp = dt_util.utcnow()
+        else:
+            tdelta = dt_util.utcnow() - self._first_error_timestamp
+            if tdelta.total_seconds() >= 60:
+                self._available = False
+
+        return self._available
+
     @property
     def device_state_attributes(self):
         """Return device specific state attributes."""
diff --git a/homeassistant/components/media_player/dlna_dmr.py b/homeassistant/components/media_player/dlna_dmr.py
index 941b8844f86..479445e9a89 100644
--- a/homeassistant/components/media_player/dlna_dmr.py
+++ b/homeassistant/components/media_player/dlna_dmr.py
@@ -26,7 +26,7 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util import get_local_ip
 
-REQUIREMENTS = ['async-upnp-client==0.13.2']
+REQUIREMENTS = ['async-upnp-client==0.13.8']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/media_player/emby.py b/homeassistant/components/media_player/emby.py
index 50d2426c315..dd43d48ee6a 100644
--- a/homeassistant/components/media_player/emby.py
+++ b/homeassistant/components/media_player/emby.py
@@ -9,9 +9,9 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.media_player import (
-    MEDIA_TYPE_MOVIE, MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW, PLATFORM_SCHEMA,
-    SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY, SUPPORT_PREVIOUS_TRACK,
-    SUPPORT_SEEK, SUPPORT_STOP, MediaPlayerDevice)
+    MEDIA_TYPE_CHANNEL, MEDIA_TYPE_MOVIE, MEDIA_TYPE_MUSIC, MEDIA_TYPE_TVSHOW,
+    PLATFORM_SCHEMA, SUPPORT_NEXT_TRACK, SUPPORT_PAUSE, SUPPORT_PLAY,
+    SUPPORT_PREVIOUS_TRACK, SUPPORT_SEEK, SUPPORT_STOP, MediaPlayerDevice)
 from homeassistant.const import (
     CONF_API_KEY, CONF_HOST, CONF_PORT, CONF_SSL, DEVICE_DEFAULT_NAME,
     EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP, STATE_IDLE, STATE_OFF,
@@ -20,7 +20,7 @@ from homeassistant.core import callback
 import homeassistant.helpers.config_validation as cv
 import homeassistant.util.dt as dt_util
 
-REQUIREMENTS = ['pyemby==1.5']
+REQUIREMENTS = ['pyemby==1.6']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -237,6 +237,8 @@ class EmbyDevice(MediaPlayerDevice):
             return MEDIA_TYPE_GENERIC_VIDEO
         if media_type == 'Audio':
             return MEDIA_TYPE_MUSIC
+        if media_type == 'TvChannel':
+            return MEDIA_TYPE_CHANNEL
         return None
 
     @property
diff --git a/homeassistant/components/media_player/gpmdp.py b/homeassistant/components/media_player/gpmdp.py
index b16eb8d417a..b4ede671d52 100644
--- a/homeassistant/components/media_player/gpmdp.py
+++ b/homeassistant/components/media_player/gpmdp.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util.json import load_json, save_json
 
-REQUIREMENTS = ['websocket-client==0.37.0']
+REQUIREMENTS = ['websocket-client==0.54.0']
 
 _CONFIGURING = {}
 _LOGGER = logging.getLogger(__name__)
@@ -155,6 +155,7 @@ class GPMDP(MediaPlayerDevice):
         self._duration = None
         self._volume = None
         self._request_id = 0
+        self._available = True
 
     def get_ws(self):
         """Check if the websocket is setup and connected."""
@@ -200,22 +201,31 @@ class GPMDP(MediaPlayerDevice):
     def update(self):
         """Get the latest details from the player."""
         time.sleep(1)
-        playstate = self.send_gpmdp_msg('playback', 'getPlaybackState')
-        if playstate is None:
-            return
-        self._status = PLAYBACK_DICT[str(playstate['value'])]
-        time_data = self.send_gpmdp_msg('playback', 'getCurrentTime')
-        if time_data is not None:
-            self._seek_position = int(time_data['value'] / 1000)
-        track_data = self.send_gpmdp_msg('playback', 'getCurrentTrack')
-        if track_data is not None:
-            self._title = track_data['value']['title']
-            self._artist = track_data['value']['artist']
-            self._albumart = track_data['value']['albumArt']
-            self._duration = int(track_data['value']['duration'] / 1000)
-        volume_data = self.send_gpmdp_msg('volume', 'getVolume')
-        if volume_data is not None:
-            self._volume = volume_data['value'] / 100
+        try:
+            self._available = True
+            playstate = self.send_gpmdp_msg('playback', 'getPlaybackState')
+            if playstate is None:
+                return
+            self._status = PLAYBACK_DICT[str(playstate['value'])]
+            time_data = self.send_gpmdp_msg('playback', 'getCurrentTime')
+            if time_data is not None:
+                self._seek_position = int(time_data['value'] / 1000)
+            track_data = self.send_gpmdp_msg('playback', 'getCurrentTrack')
+            if track_data is not None:
+                self._title = track_data['value']['title']
+                self._artist = track_data['value']['artist']
+                self._albumart = track_data['value']['albumArt']
+                self._duration = int(track_data['value']['duration'] / 1000)
+            volume_data = self.send_gpmdp_msg('volume', 'getVolume')
+            if volume_data is not None:
+                self._volume = volume_data['value'] / 100
+        except OSError:
+            self._available = False
+
+    @property
+    def available(self):
+        """Return if media player is available."""
+        return self._available
 
     @property
     def media_content_type(self):
diff --git a/homeassistant/components/media_player/harman_kardon_avr.py b/homeassistant/components/media_player/harman_kardon_avr.py
new file mode 100644
index 00000000000..46d1dd4d698
--- /dev/null
+++ b/homeassistant/components/media_player/harman_kardon_avr.py
@@ -0,0 +1,132 @@
+"""
+Support for interface with an Harman/Kardon or JBL AVR.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/media_player.harman_kardon_avr/
+"""
+import logging
+
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.components.media_player import (
+    SUPPORT_TURN_OFF, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_STEP,
+    PLATFORM_SCHEMA, SUPPORT_TURN_ON, SUPPORT_SELECT_SOURCE,
+    MediaPlayerDevice)
+from homeassistant.const import (
+    CONF_HOST, CONF_NAME, CONF_PORT, STATE_OFF, STATE_ON)
+
+REQUIREMENTS = ['hkavr==0.0.5']
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = 'Harman Kardon AVR'
+DEFAULT_PORT = 10025
+
+SUPPORT_HARMAN_KARDON_AVR = SUPPORT_VOLUME_STEP | SUPPORT_VOLUME_MUTE | \
+                            SUPPORT_TURN_OFF | SUPPORT_TURN_ON | \
+                            SUPPORT_SELECT_SOURCE
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_HOST): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
+})
+
+
+def setup_platform(hass, config, add_entities, discover_info=None):
+    """Set up the AVR platform."""
+    import hkavr
+
+    name = config[CONF_NAME]
+    host = config[CONF_HOST]
+    port = config[CONF_PORT]
+
+    avr = hkavr.HkAVR(host, port, name)
+    avr_device = HkAvrDevice(avr)
+
+    add_entities([avr_device], True)
+
+
+class HkAvrDevice(MediaPlayerDevice):
+    """Representation of a Harman Kardon AVR / JBL AVR TV."""
+
+    def __init__(self, avr):
+        """Initialize a new HarmanKardonAVR."""
+        self._avr = avr
+
+        self._name = avr.name
+        self._host = avr.host
+        self._port = avr.port
+
+        self._source_list = avr.sources
+
+        self._state = None
+        self._muted = avr.muted
+        self._current_source = avr.current_source
+
+    def update(self):
+        """Update the state of this media_player."""
+        if self._avr.is_on():
+            self._state = STATE_ON
+        elif self._avr.is_off():
+            self._state = STATE_OFF
+        else:
+            self._state = None
+
+        self._muted = self._avr.muted
+        self._current_source = self._avr.current_source
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        return self._state
+
+    @property
+    def is_volume_muted(self):
+        """Muted status not available."""
+        return self._muted
+
+    @property
+    def source(self):
+        """Return the current input source."""
+        return self._current_source
+
+    @property
+    def source_list(self):
+        """Available sources."""
+        return self._source_list
+
+    @property
+    def supported_features(self):
+        """Flag media player features that are supported."""
+        return SUPPORT_HARMAN_KARDON_AVR
+
+    def turn_on(self):
+        """Turn the AVR on."""
+        self._avr.power_on()
+
+    def turn_off(self):
+        """Turn off the AVR."""
+        self._avr.power_off()
+
+    def select_source(self, source):
+        """Select input source."""
+        return self._avr.select_source(source)
+
+    def volume_up(self):
+        """Volume up the AVR."""
+        return self._avr.volume_up()
+
+    def volume_down(self):
+        """Volume down AVR."""
+        return self._avr.volume_down()
+
+    def mute_volume(self, mute):
+        """Send mute command."""
+        return self._avr.mute(mute)
diff --git a/homeassistant/components/media_player/mpd.py b/homeassistant/components/media_player/mpd.py
index b5eecd3d403..d006b5692f1 100644
--- a/homeassistant/components/media_player/mpd.py
+++ b/homeassistant/components/media_player/mpd.py
@@ -319,7 +319,7 @@ class MpdDevice(MediaPlayerDevice):
     @property
     def shuffle(self):
         """Boolean if shuffle is enabled."""
-        return bool(self._status['random'])
+        return bool(int(self._status['random']))
 
     def set_shuffle(self, shuffle):
         """Enable/disable shuffle mode."""
diff --git a/homeassistant/components/media_player/songpal.py b/homeassistant/components/media_player/songpal.py
index 83b10997c31..c79470a82fe 100644
--- a/homeassistant/components/media_player/songpal.py
+++ b/homeassistant/components/media_player/songpal.py
@@ -4,7 +4,9 @@ Support for Songpal-enabled (Sony) media devices.
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/media_player.songpal/
 """
+import asyncio
 import logging
+from collections import OrderedDict
 
 import voluptuous as vol
 
@@ -12,11 +14,12 @@ from homeassistant.components.media_player import (
     DOMAIN, PLATFORM_SCHEMA, SUPPORT_SELECT_SOURCE, SUPPORT_TURN_OFF,
     SUPPORT_TURN_ON, SUPPORT_VOLUME_MUTE, SUPPORT_VOLUME_SET,
     SUPPORT_VOLUME_STEP, MediaPlayerDevice)
-from homeassistant.const import ATTR_ENTITY_ID, CONF_NAME, STATE_OFF, STATE_ON
+from homeassistant.const import (
+    ATTR_ENTITY_ID, CONF_NAME, STATE_OFF, STATE_ON, EVENT_HOMEASSISTANT_STOP)
 from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['python-songpal==0.0.8']
+REQUIREMENTS = ['python-songpal==0.0.9.1']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -62,7 +65,11 @@ async def async_setup_platform(
     else:
         name = config.get(CONF_NAME)
         endpoint = config.get(CONF_ENDPOINT)
-        device = SongpalDevice(name, endpoint)
+        device = SongpalDevice(name, endpoint, poll=False)
+
+    if endpoint in hass.data[PLATFORM]:
+        _LOGGER.debug("The endpoint exists already, skipping setup.")
+        return
 
     try:
         await device.initialize()
@@ -96,12 +103,13 @@ async def async_setup_platform(
 class SongpalDevice(MediaPlayerDevice):
     """Class representing a Songpal device."""
 
-    def __init__(self, name, endpoint):
+    def __init__(self, name, endpoint, poll=False):
         """Init."""
-        import songpal
+        from songpal import Device
         self._name = name
-        self.endpoint = endpoint
-        self.dev = songpal.Device(self.endpoint)
+        self._endpoint = endpoint
+        self._poll = poll
+        self.dev = Device(self._endpoint)
         self._sysinfo = None
 
         self._state = False
@@ -114,13 +122,79 @@ class SongpalDevice(MediaPlayerDevice):
         self._volume = 0
         self._is_muted = False
 
-        self._sources = []
+        self._active_source = None
+        self._sources = {}
+
+    @property
+    def should_poll(self):
+        """Return True if the device should be polled."""
+        return self._poll
 
     async def initialize(self):
         """Initialize the device."""
         await self.dev.get_supported_methods()
         self._sysinfo = await self.dev.get_system_info()
 
+    async def async_activate_websocket(self):
+        """Activate websocket for listening if wanted."""
+        _LOGGER.info("Activating websocket connection..")
+        from songpal import (VolumeChange, ContentChange,
+                             PowerChange, ConnectChange)
+
+        async def _volume_changed(volume: VolumeChange):
+            _LOGGER.debug("Volume changed: %s", volume)
+            self._volume = volume.volume
+            self._is_muted = volume.mute
+            await self.async_update_ha_state()
+
+        async def _source_changed(content: ContentChange):
+            _LOGGER.debug("Source changed: %s", content)
+            if content.is_input:
+                self._active_source = self._sources[content.source]
+                _LOGGER.debug("New active source: %s", self._active_source)
+                await self.async_update_ha_state()
+            else:
+                _LOGGER.warning("Got non-handled content change: %s",
+                                content)
+
+        async def _power_changed(power: PowerChange):
+            _LOGGER.debug("Power changed: %s", power)
+            self._state = power.status
+            await self.async_update_ha_state()
+
+        async def _try_reconnect(connect: ConnectChange):
+            _LOGGER.error("Got disconnected with %s, trying to reconnect.",
+                          connect.exception)
+            self._available = False
+            self.dev.clear_notification_callbacks()
+            await self.async_update_ha_state()
+
+            # Try to reconnect forever, a successful reconnect will initialize
+            # the websocket connection again.
+            delay = 10
+            while not self._available:
+                _LOGGER.debug("Trying to reconnect in %s seconds", delay)
+                await asyncio.sleep(delay)
+                # We need to inform HA about the state in case we are coming
+                # back from a disconnected state.
+                await self.async_update_ha_state(force_refresh=True)
+                delay = min(2*delay, 300)
+
+        self.dev.on_notification(VolumeChange, _volume_changed)
+        self.dev.on_notification(ContentChange, _source_changed)
+        self.dev.on_notification(PowerChange, _power_changed)
+        self.dev.on_notification(ConnectChange, _try_reconnect)
+
+        async def listen_events():
+            await self.dev.listen_notifications()
+
+        async def handle_stop(event):
+            await self.dev.stop_listen_notifications()
+
+        self.hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, handle_stop)
+
+        self.hass.loop.create_task(listen_events())
+
     @property
     def name(self):
         """Return name of the device."""
@@ -169,18 +243,28 @@ class SongpalDevice(MediaPlayerDevice):
 
             inputs = await self.dev.get_inputs()
             _LOGGER.debug("Got ins: %s", inputs)
-            self._sources = inputs
+
+            self._sources = OrderedDict()
+            for input_ in inputs:
+                self._sources[input_.uri] = input_
+                if input_.active:
+                    self._active_source = input_
+
+            _LOGGER.debug("Active source: %s", self._active_source)
 
             self._available = True
+
+            # activate notifications if wanted
+            if not self._poll:
+                await self.hass.async_create_task(
+                    self.async_activate_websocket())
         except SongpalException as ex:
-            # if we were available, print out the exception
-            if self._available:
-                _LOGGER.error("Got an exception: %s", ex)
+            _LOGGER.error("Unable to update: %s", ex)
             self._available = False
 
     async def async_select_source(self, source):
         """Select source."""
-        for out in self._sources:
+        for out in self._sources.values():
             if out.title == source:
                 await out.activate()
                 return
@@ -190,7 +274,7 @@ class SongpalDevice(MediaPlayerDevice):
     @property
     def source_list(self):
         """Return list of available sources."""
-        return [x.title for x in self._sources]
+        return [src.title for src in self._sources.values()]
 
     @property
     def state(self):
@@ -202,11 +286,7 @@ class SongpalDevice(MediaPlayerDevice):
     @property
     def source(self):
         """Return currently active source."""
-        for out in self._sources:
-            if out.active:
-                return out.title
-
-        return None
+        return self._active_source.title
 
     @property
     def volume_level(self):
diff --git a/homeassistant/components/media_player/ue_smart_radio.py b/homeassistant/components/media_player/ue_smart_radio.py
index 066972aaa25..75f6d92a98c 100644
--- a/homeassistant/components/media_player/ue_smart_radio.py
+++ b/homeassistant/components/media_player/ue_smart_radio.py
@@ -136,7 +136,7 @@ class UERadioDevice(MediaPlayerDevice):
     @property
     def is_volume_muted(self):
         """Boolean if volume is currently muted."""
-        return True if self._volume <= 0 else False
+        return self._volume <= 0
 
     @property
     def volume_level(self):
diff --git a/homeassistant/components/media_player/xiaomi_tv.py b/homeassistant/components/media_player/xiaomi_tv.py
index 93c4bb72b17..09d36f82db0 100644
--- a/homeassistant/components/media_player/xiaomi_tv.py
+++ b/homeassistant/components/media_player/xiaomi_tv.py
@@ -14,7 +14,7 @@ from homeassistant.components.media_player import (
 from homeassistant.const import CONF_HOST, CONF_NAME, STATE_OFF, STATE_ON
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['pymitv==1.4.0']
+REQUIREMENTS = ['pymitv==1.4.3']
 
 DEFAULT_NAME = "Xiaomi TV"
 
@@ -93,15 +93,17 @@ class XiaomiTV(MediaPlayerDevice):
         because the TV won't accept any input when turned off. Thus, the user
         would be unable to turn the TV back on, unless it's done manually.
         """
-        self._tv.sleep()
+        if self._state is not STATE_OFF:
+            self._tv.sleep()
 
-        self._state = STATE_OFF
+            self._state = STATE_OFF
 
     def turn_on(self):
         """Wake the TV back up from sleep."""
-        self._tv.wake()
+        if self._state is not STATE_ON:
+            self._tv.wake()
 
-        self._state = STATE_ON
+            self._state = STATE_ON
 
     def volume_up(self):
         """Increase volume by one."""
diff --git a/homeassistant/components/mqtt/.translations/ca.json b/homeassistant/components/mqtt/.translations/ca.json
index 72a2636fb60..1fc3ea628bb 100644
--- a/homeassistant/components/mqtt/.translations/ca.json
+++ b/homeassistant/components/mqtt/.translations/ca.json
@@ -4,25 +4,25 @@
             "single_instance_allowed": "Nom\u00e9s es permet una \u00fanica configuraci\u00f3 de MQTT."
         },
         "error": {
-            "cannot_connect": "No es pot connectar amb el broker."
+            "cannot_connect": "No s'ha pogut connectar amb el broker."
         },
         "step": {
             "broker": {
                 "data": {
                     "broker": "Broker",
-                    "discovery": "Habilita descobriment autom\u00e0tic",
+                    "discovery": "Habilita el descobriment autom\u00e0tic",
                     "password": "Contrasenya",
                     "port": "Port",
                     "username": "Nom d'usuari"
                 },
-                "description": "Introdu\u00efu la informaci\u00f3 de connexi\u00f3 del vostre broker MQTT.",
+                "description": "Introdueix la informaci\u00f3 de connexi\u00f3 del teu broker MQTT.",
                 "title": "MQTT"
             },
             "hassio_confirm": {
                 "data": {
-                    "discovery": "Habilita descobriment autom\u00e0tic"
+                    "discovery": "Habilitar descobriment autom\u00e0tic"
                 },
-                "description": "Voleu configurar Home Assistant perqu\u00e8 es connecti amb el broker MQTT proporcionat pel complement de hass.io {addon}?",
+                "description": "Vols configurar Home Assistant perqu\u00e8 es connecti amb el broker MQTT proporcionat pel complement de hass.io {addon}?",
                 "title": "Broker MQTT a trav\u00e9s del complement de Hass.io"
             }
         },
diff --git a/homeassistant/components/mqtt/__init__.py b/homeassistant/components/mqtt/__init__.py
index 6093be7d091..2750f1c1585 100644
--- a/homeassistant/components/mqtt/__init__.py
+++ b/homeassistant/components/mqtt/__init__.py
@@ -6,6 +6,7 @@ https://home-assistant.io/components/mqtt/
 """
 import asyncio
 from itertools import groupby
+import json
 import logging
 from operator import attrgetter
 import os
@@ -70,6 +71,7 @@ CONF_COMMAND_TOPIC = 'command_topic'
 CONF_AVAILABILITY_TOPIC = 'availability_topic'
 CONF_PAYLOAD_AVAILABLE = 'payload_available'
 CONF_PAYLOAD_NOT_AVAILABLE = 'payload_not_available'
+CONF_JSON_ATTRS_TOPIC = 'json_attributes_topic'
 CONF_QOS = 'qos'
 CONF_RETAIN = 'retain'
 
@@ -224,6 +226,10 @@ MQTT_ENTITY_DEVICE_INFO_SCHEMA = vol.All(vol.Schema({
     vol.Optional(CONF_SW_VERSION): cv.string,
 }), validate_device_has_at_least_one_identifier)
 
+MQTT_JSON_ATTRS_SCHEMA = vol.Schema({
+    vol.Optional(CONF_JSON_ATTRS_TOPIC): valid_subscribe_topic,
+})
+
 MQTT_BASE_PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend(SCHEMA_BASE)
 
 # Sensor type platforms subscribe to MQTT events
@@ -820,6 +826,67 @@ def _match_topic(subscription: str, topic: str) -> bool:
         return False
 
 
+class MqttAttributes(Entity):
+    """Mixin used for platforms that support JSON attributes."""
+
+    def __init__(self, config: dict) -> None:
+        """Initialize the JSON attributes mixin."""
+        self._attributes = None
+        self._attributes_sub_state = None
+        self._attributes_config = config
+
+    async def async_added_to_hass(self) -> None:
+        """Subscribe MQTT events.
+
+        This method must be run in the event loop and returns a coroutine.
+        """
+        await super().async_added_to_hass()
+        await self._attributes_subscribe_topics()
+
+    async def attributes_discovery_update(self, config: dict):
+        """Handle updated discovery message."""
+        self._attributes_config = config
+        await self._attributes_subscribe_topics()
+
+    async def _attributes_subscribe_topics(self):
+        """(Re)Subscribe to topics."""
+        from .subscription import async_subscribe_topics
+
+        @callback
+        def attributes_message_received(topic: str,
+                                        payload: SubscribePayloadType,
+                                        qos: int) -> None:
+            try:
+                json_dict = json.loads(payload)
+                if isinstance(json_dict, dict):
+                    self._attributes = json_dict
+                    self.async_schedule_update_ha_state()
+                else:
+                    _LOGGER.warning("JSON result was not a dictionary")
+                    self._attributes = None
+            except ValueError:
+                _LOGGER.warning("Erroneous JSON: %s", payload)
+                self._attributes = None
+
+        self._attributes_sub_state = await async_subscribe_topics(
+            self.hass, self._attributes_sub_state,
+            {CONF_JSON_ATTRS_TOPIC: {
+                'topic': self._attributes_config.get(CONF_JSON_ATTRS_TOPIC),
+                'msg_callback': attributes_message_received,
+                'qos': self._attributes_config.get(CONF_QOS)}})
+
+    async def async_will_remove_from_hass(self):
+        """Unsubscribe when removed."""
+        from .subscription import async_unsubscribe_topics
+        self._attributes_sub_state = await async_unsubscribe_topics(
+            self.hass, self._attributes_sub_state)
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        return self._attributes
+
+
 class MqttAvailability(Entity):
     """Mixin used for platforms that report availability."""
 
@@ -881,7 +948,8 @@ class MqttAvailability(Entity):
     async def async_will_remove_from_hass(self):
         """Unsubscribe when removed."""
         from .subscription import async_unsubscribe_topics
-        await async_unsubscribe_topics(self.hass, self._availability_sub_state)
+        self._availability_sub_state = await async_unsubscribe_topics(
+            self.hass, self._availability_sub_state)
 
     @property
     def available(self) -> bool:
diff --git a/homeassistant/components/mqtt/discovery.py b/homeassistant/components/mqtt/discovery.py
index 8d5f28278d9..92e7ffdaf4f 100644
--- a/homeassistant/components/mqtt/discovery.py
+++ b/homeassistant/components/mqtt/discovery.py
@@ -41,9 +41,10 @@ CONFIG_ENTRY_COMPONENTS = [
 ]
 
 DEPRECATED_PLATFORM_TO_SCHEMA = {
-    'mqtt': 'basic',
-    'mqtt_json': 'json',
-    'mqtt_template': 'template',
+    'light': {
+        'mqtt_json': 'json',
+        'mqtt_template': 'template',
+    }
 }
 
 
@@ -67,6 +68,7 @@ ABBREVIATIONS = {
     'bri_scl': 'brightness_scale',
     'bri_stat_t': 'brightness_state_topic',
     'bri_val_tpl': 'brightness_value_template',
+    'clr_temp_cmd_tpl': 'color_temp_command_template',
     'clr_temp_cmd_t': 'color_temp_command_topic',
     'clr_temp_stat_t': 'color_temp_state_topic',
     'clr_temp_val_tpl': 'color_temp_value_template',
@@ -196,7 +198,7 @@ async def async_start(hass: HomeAssistantType, discovery_topic, hass_config,
         if TOPIC_BASE in payload:
             base = payload[TOPIC_BASE]
             for key, value in payload.items():
-                if isinstance(value, str):
+                if isinstance(value, str) and value:
                     if value[0] == TOPIC_BASE and key.endswith('_topic'):
                         payload[key] = "{}{}".format(base, value[1:])
                     if value[-1] == TOPIC_BASE and key.endswith('_topic'):
@@ -207,10 +209,11 @@ async def async_start(hass: HomeAssistantType, discovery_topic, hass_config,
         discovery_hash = (component, discovery_id)
 
         if payload:
-            if CONF_PLATFORM in payload:
+            if CONF_PLATFORM in payload and 'schema' not in payload:
                 platform = payload[CONF_PLATFORM]
-                if platform in DEPRECATED_PLATFORM_TO_SCHEMA:
-                    schema = DEPRECATED_PLATFORM_TO_SCHEMA[platform]
+                if (component in DEPRECATED_PLATFORM_TO_SCHEMA and
+                        platform in DEPRECATED_PLATFORM_TO_SCHEMA[component]):
+                    schema = DEPRECATED_PLATFORM_TO_SCHEMA[component][platform]
                     payload['schema'] = schema
                     _LOGGER.warning('"platform": "%s" is deprecated, '
                                     'replace with "schema":"%s"',
diff --git a/homeassistant/components/mqtt/subscription.py b/homeassistant/components/mqtt/subscription.py
index 26101f32f89..e4563fc377e 100644
--- a/homeassistant/components/mqtt/subscription.py
+++ b/homeassistant/components/mqtt/subscription.py
@@ -94,6 +94,4 @@ async def async_subscribe_topics(hass: HomeAssistantType,
 @bind_hass
 async def async_unsubscribe_topics(hass: HomeAssistantType, sub_state: dict):
     """Unsubscribe from all MQTT topics managed by async_subscribe_topics."""
-    await async_subscribe_topics(hass, sub_state, {})
-
-    return sub_state
+    return await async_subscribe_topics(hass, sub_state, {})
diff --git a/homeassistant/components/mychevy.py b/homeassistant/components/mychevy.py
index 685bbb90cbb..209027ad472 100644
--- a/homeassistant/components/mychevy.py
+++ b/homeassistant/components/mychevy.py
@@ -16,7 +16,7 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers import discovery
 from homeassistant.util import Throttle
 
-REQUIREMENTS = ["mychevy==1.0.1"]
+REQUIREMENTS = ["mychevy==1.2.0"]
 
 DOMAIN = 'mychevy'
 UPDATE_TOPIC = DOMAIN
@@ -33,10 +33,15 @@ _LOGGER = logging.getLogger(__name__)
 MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=30)
 ERROR_SLEEP_TIME = timedelta(minutes=30)
 
+CONF_COUNTRY = 'country'
+DEFAULT_COUNTRY = 'us'
+
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.Schema({
         vol.Required(CONF_USERNAME): cv.string,
         vol.Required(CONF_PASSWORD): cv.string,
+        vol.Optional(CONF_COUNTRY, default=DEFAULT_COUNTRY):
+            vol.All(cv.string, vol.In(['us', 'ca']))
     }),
 }, extra=vol.ALLOW_EXTRA)
 
@@ -44,10 +49,12 @@ CONFIG_SCHEMA = vol.Schema({
 class EVSensorConfig:
     """The EV sensor configuration."""
 
-    def __init__(self, name, attr, unit_of_measurement=None, icon=None):
+    def __init__(self, name, attr, unit_of_measurement=None, icon=None,
+                 extra_attrs=None):
         """Create new sensor configuration."""
         self.name = name
         self.attr = attr
+        self.extra_attrs = extra_attrs or []
         self.unit_of_measurement = unit_of_measurement
         self.icon = icon
 
@@ -70,7 +77,8 @@ def setup(hass, base_config):
 
     email = config.get(CONF_USERNAME)
     password = config.get(CONF_PASSWORD)
-    hass.data[DOMAIN] = MyChevyHub(mc.MyChevy(email, password), hass,
+    country = config.get(CONF_COUNTRY)
+    hass.data[DOMAIN] = MyChevyHub(mc.MyChevy(email, password, country), hass,
                                    base_config)
     hass.data[DOMAIN].start()
 
diff --git a/homeassistant/components/mythicbeastsdns.py b/homeassistant/components/mythicbeastsdns.py
new file mode 100644
index 00000000000..ff45fc8a530
--- /dev/null
+++ b/homeassistant/components/mythicbeastsdns.py
@@ -0,0 +1,59 @@
+"""
+Integrate with Mythic Beasts Dynamic DNS service.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/mythicbeastsdns/
+"""
+from datetime import timedelta
+import logging
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
+from homeassistant.const import CONF_HOST, CONF_DOMAIN, CONF_PASSWORD
+from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+REQUIREMENTS = ['mbddns==0.1.2']
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = 'mythicbeastsdns'
+
+DEFAULT_INTERVAL = timedelta(minutes=10)
+
+CONF_UPDATE_INTERVAL = 'update_interval'
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_HOST): cv.string,
+        vol.Required(CONF_DOMAIN): cv.string,
+        vol.Required(CONF_PASSWORD): cv.string,
+        vol.Optional(CONF_UPDATE_INTERVAL, default=DEFAULT_INTERVAL): vol.All(
+            cv.time_period, cv.positive_timedelta),
+    })
+}, extra=vol.ALLOW_EXTRA)
+
+
+async def async_setup(hass, config):
+    """Initialize the Mythic Beasts component."""
+    import mbddns
+
+    domain = config[DOMAIN][CONF_DOMAIN]
+    password = config[DOMAIN][CONF_PASSWORD]
+    host = config[DOMAIN][CONF_HOST]
+    update_interval = config[DOMAIN][CONF_UPDATE_INTERVAL]
+
+    session = async_get_clientsession(hass)
+
+    result = await mbddns.update(domain, password, host, session=session)
+
+    if not result:
+        return False
+
+    async def update_domain_interval(now):
+        """Update the DNS entry."""
+        await mbddns.update(domain, password, host, session=session)
+
+    async_track_time_interval(hass, update_domain_interval, update_interval)
+
+    return True
diff --git a/homeassistant/components/namecheapdns.py b/homeassistant/components/namecheapdns.py
index 32a5c318852..f817544ca77 100644
--- a/homeassistant/components/namecheapdns.py
+++ b/homeassistant/components/namecheapdns.py
@@ -14,6 +14,8 @@ from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_DOMAIN
 from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
+REQUIREMENTS = ['defusedxml==0.5.0']
+
 _LOGGER = logging.getLogger(__name__)
 
 DOMAIN = 'namecheapdns'
@@ -55,7 +57,7 @@ async def async_setup(hass, config):
 
 async def _update_namecheapdns(session, host, domain, password):
     """Update namecheap DNS entry."""
-    import xml.etree.ElementTree as ET
+    import defusedxml.ElementTree as ET
 
     params = {
         'host': host,
diff --git a/homeassistant/components/neato.py b/homeassistant/components/neato.py
index c6ab06d6884..5da70bfdcd2 100644
--- a/homeassistant/components/neato.py
+++ b/homeassistant/components/neato.py
@@ -17,7 +17,7 @@ from homeassistant.util import Throttle
 
 _LOGGER = logging.getLogger(__name__)
 
-REQUIREMENTS = ['pybotvac==0.0.10']
+REQUIREMENTS = ['pybotvac==0.0.12']
 
 DOMAIN = 'neato'
 NEATO_ROBOTS = 'neato_robots'
@@ -63,6 +63,7 @@ ERRORS = {
     'ui_error_battery_mismatch': 'Replace battery',
     'ui_error_battery_nothermistor': 'Replace battery',
     'ui_error_battery_overtemp': 'Replace battery',
+    'ui_error_battery_overvolt': 'Replace battery',
     'ui_error_battery_undercurrent': 'Replace battery',
     'ui_error_battery_undertemp': 'Replace battery',
     'ui_error_battery_undervolt': 'Replace battery',
@@ -73,27 +74,38 @@ ERRORS = {
     'ui_error_check_battery_switch': 'Check battery',
     'ui_error_corrupt_scb': 'Call customer service corrupt board',
     'ui_error_deck_debris': 'Deck debris',
+    'ui_error_dflt_app': 'Check Neato app',
+    'ui_error_disconnect_chrg_cable': 'Disconnected charge cable',
+    'ui_error_disconnect_usb_cable': 'Disconnected USB cable',
     'ui_error_dust_bin_missing': 'Dust bin missing',
     'ui_error_dust_bin_full': 'Dust bin full',
     'ui_error_dust_bin_emptied': 'Dust bin emptied',
     'ui_error_hardware_failure': 'Hardware failure',
     'ui_error_ldrop_stuck': 'Clear my path',
+    'ui_error_lds_jammed': 'Clear my path',
+    'ui_error_lds_bad_packets': 'Check Neato app',
+    'ui_error_lds_disconnected': 'Check Neato app',
+    'ui_error_lds_missed_packets': 'Check Neato app',
     'ui_error_lwheel_stuck': 'Clear my path',
     'ui_error_navigation_backdrop_frontbump': 'Clear my path',
     'ui_error_navigation_backdrop_leftbump': 'Clear my path',
     'ui_error_navigation_backdrop_wheelextended': 'Clear my path',
     'ui_error_navigation_noprogress': 'Clear my path',
     'ui_error_navigation_origin_unclean': 'Clear my path',
-    'ui_error_navigation_pathproblems_returninghome': 'Cannot return to base',
+    'ui_error_navigation_pathproblems': 'Cannot return to base',
+    'ui_error_navigation_pinkycommsfail': 'Clear my path',
     'ui_error_navigation_falling': 'Clear my path',
     'ui_error_navigation_noexitstogo': 'Clear my path',
     'ui_error_navigation_nomotioncommands': 'Clear my path',
     'ui_error_navigation_rightdrop_leftbump': 'Clear my path',
     'ui_error_navigation_undockingfailed': 'Clear my path',
     'ui_error_picked_up': 'Picked up',
+    'ui_error_qa_fail': 'Check Neato app',
     'ui_error_rdrop_stuck': 'Clear my path',
+    'ui_error_reconnect_failed': 'Reconnect failed',
     'ui_error_rwheel_stuck': 'Clear my path',
     'ui_error_stuck': 'Stuck!',
+    'ui_error_unable_to_return_to_base': 'Unable to return to base',
     'ui_error_unable_to_see': 'Clean vacuum sensors',
     'ui_error_vacuum_slip': 'Clear my path',
     'ui_error_vacuum_stuck': 'Clear my path',
@@ -112,6 +124,7 @@ ERRORS = {
     'lds_deck_debris': 'Debris on deck',
     'lds_disconnected': 'Disconnected',
     'lds_jammed': 'Jammed',
+    'lds_missed_packets': 'Missed packets',
     'maint_brush_stuck': 'Brush stuck',
     'maint_brush_overload': 'Brush overloaded',
     'maint_bumper_stuck': 'Bumper stuck',
@@ -139,11 +152,24 @@ ERRORS = {
 ALERTS = {
     'ui_alert_dust_bin_full': 'Please empty dust bin',
     'ui_alert_recovering_location': 'Returning to start',
+    'ui_alert_battery_chargebasecommerr': 'Battery error',
+    'ui_alert_busy_charging': 'Busy charging',
+    'ui_alert_charging_base': 'Base charging',
+    'ui_alert_charging_power': 'Charging power',
+    'ui_alert_connect_chrg_cable': 'Connect charge cable',
+    'ui_alert_info_thank_you': 'Thank you',
+    'ui_alert_invalid': 'Invalid check app',
+    'ui_alert_old_error': 'Old error',
+    'ui_alert_swupdate_fail': 'Update failed',
     'dustbin_full': 'Please empty dust bin',
     'maint_brush_change': 'Change the brush',
     'maint_filter_change': 'Change the filter',
     'clean_completed_to_start': 'Cleaning completed',
-    'nav_floorplan_not_created': 'No floorplan found'
+    'nav_floorplan_not_created': 'No floorplan found',
+    'nav_floorplan_load_fail': 'Failed to load floorplan',
+    'nav_floorplan_localization_fail': 'Failed to load floorplan',
+    'clean_incomplete_to_start': 'Cleaning incomplete',
+    'log_upload_failed': 'Logs failed to upload'
 }
 
 
diff --git a/homeassistant/components/ness_alarm.py b/homeassistant/components/ness_alarm.py
new file mode 100644
index 00000000000..e97ee903abc
--- /dev/null
+++ b/homeassistant/components/ness_alarm.py
@@ -0,0 +1,121 @@
+"""
+Support for Ness D8X/D16X devices.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/ness_alarm/
+"""
+import logging
+from collections import namedtuple
+
+import voluptuous as vol
+
+from homeassistant.components.binary_sensor import DEVICE_CLASSES
+from homeassistant.const import EVENT_HOMEASSISTANT_STOP
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.discovery import async_load_platform
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+
+REQUIREMENTS = ['nessclient==0.9.9']
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = 'ness_alarm'
+DATA_NESS = 'ness_alarm'
+
+CONF_DEVICE_HOST = 'host'
+CONF_DEVICE_PORT = 'port'
+CONF_ZONES = 'zones'
+CONF_ZONE_NAME = 'name'
+CONF_ZONE_TYPE = 'type'
+CONF_ZONE_ID = 'id'
+ATTR_CODE = 'code'
+ATTR_OUTPUT_ID = 'output_id'
+ATTR_STATE = 'state'
+DEFAULT_ZONES = []
+
+SIGNAL_ZONE_CHANGED = 'ness_alarm.zone_changed'
+SIGNAL_ARMING_STATE_CHANGED = 'ness_alarm.arming_state_changed'
+
+ZoneChangedData = namedtuple('ZoneChangedData', ['zone_id', 'state'])
+
+DEFAULT_ZONE_TYPE = 'motion'
+ZONE_SCHEMA = vol.Schema({
+    vol.Required(CONF_ZONE_NAME): cv.string,
+    vol.Required(CONF_ZONE_ID): cv.positive_int,
+    vol.Optional(CONF_ZONE_TYPE, default=DEFAULT_ZONE_TYPE):
+        vol.In(DEVICE_CLASSES)})
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_DEVICE_HOST): cv.string,
+        vol.Required(CONF_DEVICE_PORT): cv.port,
+        vol.Optional(CONF_ZONES, default=DEFAULT_ZONES):
+            vol.All(cv.ensure_list, [ZONE_SCHEMA]),
+    }),
+}, extra=vol.ALLOW_EXTRA)
+
+SERVICE_PANIC = 'panic'
+SERVICE_AUX = 'aux'
+
+SERVICE_SCHEMA_PANIC = vol.Schema({
+    vol.Required(ATTR_CODE): cv.string,
+})
+SERVICE_SCHEMA_AUX = vol.Schema({
+    vol.Required(ATTR_OUTPUT_ID): cv.positive_int,
+    vol.Optional(ATTR_STATE, default=True): cv.boolean,
+})
+
+
+async def async_setup(hass, config):
+    """Set up the Ness Alarm platform."""
+    from nessclient import Client, ArmingState
+    conf = config[DOMAIN]
+
+    zones = conf[CONF_ZONES]
+    host = conf[CONF_DEVICE_HOST]
+    port = conf[CONF_DEVICE_PORT]
+
+    client = Client(host=host, port=port, loop=hass.loop)
+    hass.data[DATA_NESS] = client
+
+    async def _close(event):
+        await client.close()
+
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _close)
+
+    hass.async_create_task(
+        async_load_platform(hass, 'binary_sensor', DOMAIN, {CONF_ZONES: zones},
+                            config))
+    hass.async_create_task(
+        async_load_platform(hass, 'alarm_control_panel', DOMAIN, {}, config))
+
+    def on_zone_change(zone_id: int, state: bool):
+        """Receives and propagates zone state updates."""
+        async_dispatcher_send(hass, SIGNAL_ZONE_CHANGED, ZoneChangedData(
+            zone_id=zone_id,
+            state=state,
+        ))
+
+    def on_state_change(arming_state: ArmingState):
+        """Receives and propagates arming state updates."""
+        async_dispatcher_send(hass, SIGNAL_ARMING_STATE_CHANGED, arming_state)
+
+    client.on_zone_change(on_zone_change)
+    client.on_state_change(on_state_change)
+
+    # Force update for current arming status and current zone states
+    hass.loop.create_task(client.keepalive())
+    hass.loop.create_task(client.update())
+
+    async def handle_panic(call):
+        await client.panic(call.data[ATTR_CODE])
+
+    async def handle_aux(call):
+        await client.aux(call.data[ATTR_OUTPUT_ID], call.data[ATTR_STATE])
+
+    hass.services.async_register(DOMAIN, SERVICE_PANIC, handle_panic,
+                                 schema=SERVICE_SCHEMA_PANIC)
+    hass.services.async_register(DOMAIN, SERVICE_AUX, handle_aux,
+                                 schema=SERVICE_SCHEMA_AUX)
+
+    return True
diff --git a/homeassistant/components/nest/.translations/ca.json b/homeassistant/components/nest/.translations/ca.json
index e15d0106da8..179c8f20951 100644
--- a/homeassistant/components/nest/.translations/ca.json
+++ b/homeassistant/components/nest/.translations/ca.json
@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Nom\u00e9s podeu configurar un \u00fanic compte Nest.",
+            "already_setup": "Nom\u00e9s pots configurar un \u00fanic compte Nest.",
             "authorize_url_fail": "S'ha produ\u00eft un error desconegut al generar l'URL d'autoritzaci\u00f3.",
-            "authorize_url_timeout": "Temps d'espera generant l'URL d'autoritzaci\u00f3 esgotat.",
-            "no_flows": "Necessiteu configurar Nest abans de poder autenticar-vos-hi. [Llegiu les instruccions](https://www.home-assistant.io/components/nest/)."
+            "authorize_url_timeout": "El temps d'espera m\u00e0xim per generar l'URL d'autoritzaci\u00f3 s'ha esgotat.",
+            "no_flows": "Necessites configurar Nest abans de poder autenticar-t'hi. Llegeix les [instruccions](https://www.home-assistant.io/components/nest/)."
         },
         "error": {
             "internal_error": "Error intern al validar el codi",
@@ -17,15 +17,15 @@
                 "data": {
                     "flow_impl": "Prove\u00efdor"
                 },
-                "description": "Trieu a trav\u00e9s de quin prove\u00efdor d'autenticaci\u00f3 us voleu autenticar amb Nest.",
+                "description": "Tria a amb quin prove\u00efdor d'autenticaci\u00f3 vols autenticar-te amb Nest.",
                 "title": "Prove\u00efdor d'autenticaci\u00f3"
             },
             "link": {
                 "data": {
-                    "code": "Codi pin"
+                    "code": "Codi PIN"
                 },
-                "description": "Per enlla\u00e7ar el vostre compte de Nest, [autoritzeu el vostre compte] ({url}). \n\nDespr\u00e9s de l'autoritzaci\u00f3, copieu i enganxeu el codi pin que es mostra a sota.",
-                "title": "Enlla\u00e7ar compte de Nest"
+                "description": "Per enlla\u00e7ar el teu compte de Nest, [autoritza el vostre compte]({url}). \n\nDespr\u00e9s de l'autoritzaci\u00f3, copia i enganxa el codi pin que es mostra a sota.",
+                "title": "Enlla\u00e7 amb el compte de Nest"
             }
         },
         "title": "Nest"
diff --git a/homeassistant/components/nest/.translations/hu.json b/homeassistant/components/nest/.translations/hu.json
index aa99b46e576..e24c38f8608 100644
--- a/homeassistant/components/nest/.translations/hu.json
+++ b/homeassistant/components/nest/.translations/hu.json
@@ -2,9 +2,11 @@
     "config": {
         "abort": {
             "already_setup": "Csak egy Nest-fi\u00f3kot konfigur\u00e1lhat.",
+            "authorize_url_fail": "Ismeretlen hiba t\u00f6rt\u00e9nt a hiteles\u00edt\u00e9si link gener\u00e1l\u00e1sa sor\u00e1n.",
             "authorize_url_timeout": "Id\u0151t\u00fall\u00e9p\u00e9s az \u00e9rv\u00e9nyes\u00edt\u00e9si url gener\u00e1l\u00e1sa sor\u00e1n."
         },
         "error": {
+            "internal_error": "Bels\u0151 hiba t\u00f6rt\u00e9nt a k\u00f3d valid\u00e1l\u00e1s\u00e1n\u00e1l",
             "invalid_code": "\u00c9rv\u00e9nytelen k\u00f3d",
             "timeout": "Id\u0151t\u00fall\u00e9p\u00e9s a k\u00f3d \u00e9rv\u00e9nyes\u00edt\u00e9se sor\u00e1n.",
             "unknown": "Ismeretlen hiba t\u00f6rt\u00e9nt a k\u00f3d \u00e9rv\u00e9nyes\u00edt\u00e9se sor\u00e1n"
@@ -14,6 +16,7 @@
                 "data": {
                     "flow_impl": "Szolg\u00e1ltat\u00f3"
                 },
+                "description": "V\u00e1laszd ki, hogy melyik hiteles\u00edt\u00e9si szolg\u00e1ltat\u00f3n\u00e1l szeretn\u00e9d hiteles\u00edteni a Nestet.",
                 "title": "Hiteles\u00edt\u00e9si Szolg\u00e1ltat\u00f3"
             },
             "link": {
diff --git a/homeassistant/components/notify/lametric.py b/homeassistant/components/notify/lametric.py
index 0cc3a0213b3..61bc5172af0 100644
--- a/homeassistant/components/notify/lametric.py
+++ b/homeassistant/components/notify/lametric.py
@@ -85,7 +85,7 @@ class LaMetricNotificationService(BaseNotificationService):
                     _LOGGER.error("Sound ID %s unknown, ignoring",
                                   data["sound"])
             if "cycles" in data:
-                cycles = data['cycles']
+                cycles = int(data['cycles'])
             if "priority" in data:
                 if data['priority'] in AVAILABLE_PRIORITIES:
                     priority = data['priority']
diff --git a/homeassistant/components/notify/slack.py b/homeassistant/components/notify/slack.py
index 599633ff5ff..8e23c9f4fa0 100644
--- a/homeassistant/components/notify/slack.py
+++ b/homeassistant/components/notify/slack.py
@@ -17,7 +17,7 @@ from homeassistant.components.notify import (
     BaseNotificationService)
 from homeassistant.const import (CONF_API_KEY, CONF_USERNAME, CONF_ICON)
 
-REQUIREMENTS = ['slacker==0.11.0']
+REQUIREMENTS = ['slacker==0.12.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/notify/synology_chat.py b/homeassistant/components/notify/synology_chat.py
index 3fbb7823dc0..922631b4045 100644
--- a/homeassistant/components/notify/synology_chat.py
+++ b/homeassistant/components/notify/synology_chat.py
@@ -12,13 +12,14 @@ import voluptuous as vol
 
 from homeassistant.components.notify import (
     BaseNotificationService, PLATFORM_SCHEMA, ATTR_DATA)
-from homeassistant.const import CONF_RESOURCE
+from homeassistant.const import CONF_RESOURCE, CONF_VERIFY_SSL
 import homeassistant.helpers.config_validation as cv
 
 ATTR_FILE_URL = 'file_url'
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_RESOURCE): cv.url,
+    vol.Optional(CONF_VERIFY_SSL, default=True): cv.boolean,
 })
 
 _LOGGER = logging.getLogger(__name__)
@@ -27,16 +28,18 @@ _LOGGER = logging.getLogger(__name__)
 def get_service(hass, config, discovery_info=None):
     """Get the Synology Chat notification service."""
     resource = config.get(CONF_RESOURCE)
+    verify_ssl = config.get(CONF_VERIFY_SSL)
 
-    return SynologyChatNotificationService(resource)
+    return SynologyChatNotificationService(resource, verify_ssl)
 
 
 class SynologyChatNotificationService(BaseNotificationService):
     """Implementation of a notification service for Synology Chat."""
 
-    def __init__(self, resource):
+    def __init__(self, resource, verify_ssl):
         """Initialize the service."""
         self._resource = resource
+        self._verify_ssl = verify_ssl
 
     def send_message(self, message="", **kwargs):
         """Send a message to a user."""
@@ -52,7 +55,8 @@ class SynologyChatNotificationService(BaseNotificationService):
 
         to_send = 'payload={}'.format(json.dumps(data))
 
-        response = requests.post(self._resource, data=to_send, timeout=10)
+        response = requests.post(self._resource, data=to_send, timeout=10,
+                                 verify=self._verify_ssl)
 
         if response.status_code not in (200, 201):
             _LOGGER.exception(
diff --git a/homeassistant/components/notify/twilio_sms.py b/homeassistant/components/notify/twilio_sms.py
index 52cfe2f436d..e106c5ae6aa 100644
--- a/homeassistant/components/notify/twilio_sms.py
+++ b/homeassistant/components/notify/twilio_sms.py
@@ -21,7 +21,10 @@ CONF_FROM_NUMBER = "from_number"
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_FROM_NUMBER):
-        vol.All(cv.string, vol.Match(r"^\+?[1-9]\d{1,14}$")),
+        vol.All(cv.string,
+                vol.Match(r"^\+?[1-9]\d{1,14}$|"
+                          r"^(?=.{1,11}$)[a-zA-Z0-9\s]*"
+                          r"[a-zA-Z][a-zA-Z0-9\s]*$")),
 })
 
 
diff --git a/homeassistant/components/notify/twitter.py b/homeassistant/components/notify/twitter.py
index 6076cd5393a..8f80156c436 100644
--- a/homeassistant/components/notify/twitter.py
+++ b/homeassistant/components/notify/twitter.py
@@ -19,7 +19,7 @@ from homeassistant.components.notify import (
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_USERNAME
 from homeassistant.helpers.event import async_track_point_in_time
 
-REQUIREMENTS = ['TwitterAPI==2.5.4']
+REQUIREMENTS = ['TwitterAPI==2.5.8']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -78,10 +78,25 @@ class TwitterNotificationService(BaseNotificationService):
     def send_message_callback(self, message, media_id=None):
         """Tweet a message, optionally with media."""
         if self.user:
-            resp = self.api.request('direct_messages/new',
-                                    {'user': self.user,
-                                     'text': message,
-                                     'media_ids': media_id})
+            user_resp = self.api.request(
+                'users/lookup', {'screen_name': self.user})
+            user_id = user_resp.json()[0]['id']
+            if user_resp.status_code != 200:
+                self.log_error_resp(user_resp)
+            else:
+                _LOGGER.debug("Message posted: %s", user_resp.json())
+
+            event = {
+                'event': {
+                    'type': 'message_create',
+                    'message_create': {
+                        'target': {'recipient_id': user_id},
+                        'message_data': {'text': message},
+                    }
+                }
+            }
+            resp = self.api.request(
+                'direct_messages/events/new', json.dumps(event))
         else:
             resp = self.api.request('statuses/update',
                                     {'status': message,
diff --git a/homeassistant/components/opentherm_gw/__init__.py b/homeassistant/components/opentherm_gw/__init__.py
index 06dcd0e19b0..cf74aae7577 100644
--- a/homeassistant/components/opentherm_gw/__init__.py
+++ b/homeassistant/components/opentherm_gw/__init__.py
@@ -104,7 +104,7 @@ CONFIG_SCHEMA = vol.Schema({
     }),
 }, extra=vol.ALLOW_EXTRA)
 
-REQUIREMENTS = ['pyotgw==0.3b1']
+REQUIREMENTS = ['pyotgw==0.4b1']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/openuv/.translations/ca.json b/homeassistant/components/openuv/.translations/ca.json
index 4a6cf526921..5cb9a8ce5a5 100644
--- a/homeassistant/components/openuv/.translations/ca.json
+++ b/homeassistant/components/openuv/.translations/ca.json
@@ -12,7 +12,7 @@
                     "latitude": "Latitud",
                     "longitude": "Longitud"
                 },
-                "title": "Introdu\u00efu la vostra informaci\u00f3"
+                "title": "Introdueix la teva informaci\u00f3"
             }
         },
         "title": "OpenUV"
diff --git a/homeassistant/components/owntracks/.translations/ca.json b/homeassistant/components/owntracks/.translations/ca.json
index 438148f414c..c733f0f12cc 100644
--- a/homeassistant/components/owntracks/.translations/ca.json
+++ b/homeassistant/components/owntracks/.translations/ca.json
@@ -4,12 +4,12 @@
             "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
         },
         "create_entry": {
-            "default": "\n\nPer Android: obre [l'app OwnTracks]({android_url}), ves a prefer\u00e8ncies -> connexi\u00f3, i posa els par\u00e0metres seguents:\n - Mode: Private HTTP\n - Host: {webhook_url}\n - Identification:\n   - Username: `<Your name>`\n   - Device ID: `<Your device name>`\n\nPer iOS: obre [l'app OwnTracks]({ios_url}), clica l'icona (i) a dalt a l'esquerra -> configuraci\u00f3 (settings), i posa els par\u00e0metres settings:\n - Mode: HTTP\n - URL: {webhook_url}\n - Turn on authentication\n - UserID: `<Your name>`\n\n{secret}\n\nVegeu [the documentation]({docs_url}) per a m\u00e9s informaci\u00f3."
+            "default": "\n\nPer Android: obre [l'app d'OwnTracks]({android_url}), ves a prefer\u00e8ncies -> connexi\u00f3, i posa els par\u00e0metres seguents:\n - Mode: Private HTTP\n - Host: {webhook_url}\n - Identification:\n   - Username: `<Your name>`\n   - Device ID: `<Your device name>`\n\nPer iOS: obre [l'app d'OwnTracks]({ios_url}), clica l'icona (i) a dalt a l'esquerra -> configuraci\u00f3 (settings), i posa els par\u00e0metres seg\u00fcents:\n - Mode: HTTP\n - URL: {webhook_url}\n - Turn on authentication\n - UserID: `<Your name>`\n\n{secret}\n\nConsulta [la documentaci\u00f3]({docs_url}) per a m\u00e9s informaci\u00f3."
         },
         "step": {
             "user": {
-                "description": "Esteu segur que voleu configurar OwnTracks?",
-                "title": "Configureu OwnTracks"
+                "description": "Est\u00e0s segur que vols configurar l'OwnTracks?",
+                "title": "Configuraci\u00f3 d'OwnTracks"
             }
         },
         "title": "OwnTracks"
diff --git a/homeassistant/components/owntracks/.translations/hu.json b/homeassistant/components/owntracks/.translations/hu.json
index 9c4e46a28bf..a82843bef53 100644
--- a/homeassistant/components/owntracks/.translations/hu.json
+++ b/homeassistant/components/owntracks/.translations/hu.json
@@ -1,5 +1,11 @@
 {
     "config": {
+        "abort": {
+            "one_instance_allowed": "Csak egyetlen konfigur\u00e1ci\u00f3 sz\u00fcks\u00e9ges."
+        },
+        "create_entry": {
+            "default": "\n\nAndroidon, nyisd meg [az OwnTracks appot]({android_url}), menj a preferences -> connectionre. V\u00e1ltoztasd meg a al\u00e1bbi be\u00e1ll\u00edt\u00e1sokat:\n - Mode: Private HTTP\n - Host: {webhook_url}\n - Identification:\n   - Username: `<Your name>`\n   - Device ID: `<Your device name>`\n\niOS-en, nyisd meg [az OwnTracks appot]({ios_url}), kattints az (i) ikonra bal oldalon fel\u00fcl -> settings. V\u00e1ltoztasd meg az al\u00e1bbi be\u00e1ll\u00edt\u00e1sokat:\n - Mode: HTTP\n - URL: {webhook_url}\n - Turn on authentication\n - UserID: `<Your name>`\n\n{secret}\n\nN\u00e9zd meg [a dokument\u00e1ci\u00f3t]({docs_url}) tov\u00e1bbi inform\u00e1ci\u00f3k\u00e9rt."
+        },
         "step": {
             "user": {
                 "description": "Biztosan be szeretn\u00e9d \u00e1ll\u00edtani az Owntracks-t?",
diff --git a/homeassistant/components/owntracks/.translations/pl.json b/homeassistant/components/owntracks/.translations/pl.json
index 134c49ecbbb..85a39095f87 100644
--- a/homeassistant/components/owntracks/.translations/pl.json
+++ b/homeassistant/components/owntracks/.translations/pl.json
@@ -4,12 +4,12 @@
             "one_instance_allowed": "Wymagana jest tylko jedna instancja."
         },
         "create_entry": {
-            "default": "Na Androida, otw\u00f3rz [the OwnTracks app]({android_url}), id\u017a do preferencje -> po\u0142aczenia. Zmie\u0144 nast\u0119puj\u0105ce ustawienia:\n - Tryb: Private HTTP\n - Host: {webhook_url}\n - Identyfikacja:\n   - Nazwa u\u017cytkownika: `<Your name>`\n   - ID urz\u0105dzenia: `<Your device name>`\n\nNa iOS, otw\u00f3rz [the OwnTracks app]({ios_url}), stuknij ikon\u0119 (i) w lewym g\u00f3rnym rogu -> ustawienia. Zmie\u0144 nast\u0119puj\u0105ce ustawienia:\n - Tryb: HTTP\n - URL: {webhook_url}\n - W\u0142\u0105cz uwierzytelnianie\n - ID u\u017cytkownika: `<Your name>`\n\n{secret}"
+            "default": "\n\nNa Androidzie, otw\u00f3rz [aplikacj\u0119 OwnTracks]({android_url}), id\u017a do: ustawienia -> po\u0142aczenia. Zmie\u0144 nast\u0119puj\u0105ce ustawienia:\n - Tryb: Private HTTP\n - Host: {webhook_url}\n - Identyfikacja:\n   - Nazwa u\u017cytkownika: `<Your name>`\n   - ID urz\u0105dzenia: `<Your device name>`\n\nNa iOS, otw\u00f3rz [aplikacj\u0119 OwnTracks]({ios_url}), naci\u015bnij ikon\u0119 (i) w lewym g\u00f3rnym rogu -> ustawienia. Zmie\u0144 nast\u0119puj\u0105ce ustawienia:\n - Tryb: HTTP\n - URL: {webhook_url}\n - W\u0142\u0105cz uwierzytelnianie\n - ID u\u017cytkownika: `<Your name>`\n\n{secret}\n\nZapoznaj si\u0119 z [dokumentacj\u0105]({docs_url}) by pozna\u0107 szczeg\u00f3\u0142y."
         },
         "step": {
             "user": {
                 "description": "Czy na pewno chcesz skonfigurowa\u0107 OwnTracks?",
-                "title": "Skonfiguruj OwnTracks"
+                "title": "Konfiguracja  OwnTracks"
             }
         },
         "title": "OwnTracks"
diff --git a/homeassistant/components/owntracks/config_flow.py b/homeassistant/components/owntracks/config_flow.py
index 8cf19e84bcd..6818efbbf75 100644
--- a/homeassistant/components/owntracks/config_flow.py
+++ b/homeassistant/components/owntracks/config_flow.py
@@ -9,8 +9,7 @@ CONF_SECRET = 'secret'
 def supports_encryption():
     """Test if we support encryption."""
     try:
-        # pylint: disable=unused-variable
-        import libnacl   # noqa
+        import libnacl   # noqa pylint: disable=unused-import
         return True
     except OSError:
         return False
diff --git a/homeassistant/components/plant.py b/homeassistant/components/plant.py
index 9659fd4f7e1..cdd3c8463aa 100644
--- a/homeassistant/components/plant.py
+++ b/homeassistant/components/plant.py
@@ -105,9 +105,6 @@ async def async_setup(hass, config):
     for plant_name, plant_config in config[DOMAIN].items():
         _LOGGER.info("Added plant %s", plant_name)
         entity = Plant(plant_name, plant_config)
-        sensor_entity_ids = list(plant_config[CONF_SENSORS].values())
-        _LOGGER.debug("Subscribing to entity_ids %s", sensor_entity_ids)
-        async_track_state_change(hass, sensor_entity_ids, entity.state_changed)
         entities.append(entity)
 
     await component.async_add_entities(entities)
@@ -250,6 +247,14 @@ class Plant(Entity):
             # only use the database if it's configured
             self.hass.async_add_job(self._load_history_from_db)
 
+        async_track_state_change(self.hass, list(self._sensormap),
+                                 self.state_changed)
+
+        for entity_id in self._sensormap:
+            state = self.hass.states.get(entity_id)
+            if state is not None:
+                self.state_changed(entity_id, None, state)
+
     async def _load_history_from_db(self):
         """Load the history of the brightness values from the database.
 
diff --git a/homeassistant/components/plum_lightpad.py b/homeassistant/components/plum_lightpad.py
new file mode 100644
index 00000000000..979f257f25f
--- /dev/null
+++ b/homeassistant/components/plum_lightpad.py
@@ -0,0 +1,76 @@
+"""
+Support for Plum Lightpad switches.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/plum_lightpad
+"""
+import asyncio
+import logging
+
+import voluptuous as vol
+
+from homeassistant.const import (
+    CONF_PASSWORD, CONF_USERNAME, EVENT_HOMEASSISTANT_STOP)
+from homeassistant.helpers import discovery
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+import homeassistant.helpers.config_validation as cv
+
+REQUIREMENTS = ['plumlightpad==0.0.11']
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = 'plum_lightpad'
+
+CONFIG_SCHEMA = vol.Schema({
+    DOMAIN: vol.Schema({
+        vol.Required(CONF_USERNAME): cv.string,
+        vol.Required(CONF_PASSWORD): cv.string,
+    }),
+}, extra=vol.ALLOW_EXTRA)
+
+PLUM_DATA = 'plum'
+
+
+async def async_setup(hass, config):
+    """Plum Lightpad Platform initialization."""
+    from plumlightpad import Plum
+
+    conf = config[DOMAIN]
+    plum = Plum(conf[CONF_USERNAME], conf[CONF_PASSWORD])
+
+    hass.data[PLUM_DATA] = plum
+
+    def cleanup(event):
+        """Clean up resources."""
+        plum.cleanup()
+
+    hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, cleanup)
+
+    cloud_web_sesison = async_get_clientsession(hass, verify_ssl=True)
+    await plum.loadCloudData(cloud_web_sesison)
+
+    async def new_load(device):
+        """Load light and sensor platforms when LogicalLoad is detected."""
+        await asyncio.wait([
+            hass.async_create_task(
+                discovery.async_load_platform(
+                    hass, 'light', DOMAIN,
+                    discovered=device, hass_config=conf))
+        ])
+
+    async def new_lightpad(device):
+        """Load light and binary sensor platforms when Lightpad detected."""
+        await asyncio.wait([
+            hass.async_create_task(
+                discovery.async_load_platform(
+                    hass, 'light', DOMAIN,
+                    discovered=device, hass_config=conf))
+        ])
+
+    device_web_session = async_get_clientsession(hass, verify_ssl=False)
+    hass.async_create_task(
+        plum.discover(hass.loop,
+                      loadListener=new_load, lightpadListener=new_lightpad,
+                      websession=device_web_session))
+
+    return True
diff --git a/homeassistant/components/point/.translations/ca.json b/homeassistant/components/point/.translations/ca.json
index 6298b29f268..6a66735e6d0 100644
--- a/homeassistant/components/point/.translations/ca.json
+++ b/homeassistant/components/point/.translations/ca.json
@@ -1,29 +1,29 @@
 {
     "config": {
         "abort": {
-            "already_setup": "Nom\u00e9s podeu configurar un compte de Point.",
+            "already_setup": "Nom\u00e9s pots configurar un compte de Point.",
             "authorize_url_fail": "S'ha produ\u00eft un error desconegut al generar l'URL d'autoritzaci\u00f3.",
             "authorize_url_timeout": "S'ha acabat el temps d'espera mentre \u00e9s generava l'URL d'autoritzaci\u00f3.",
             "external_setup": "Point s'ha configurat correctament des d'un altre lloc.",
-            "no_flows": "Necessiteu configurar Point abans de poder autenticar-vos-hi. [Llegiu les instruccions](https://www.home-assistant.io/components/point/)."
+            "no_flows": "Necessites configurar Point abans de poder autenticar-t'hi. [Llegiu les instruccions](https://www.home-assistant.io/components/point/)."
         },
         "create_entry": {
-            "default": "Autenticaci\u00f3 exitosa amb Minut per als vostres dispositiu/s Point."
+            "default": "Autenticaci\u00f3 exitosa amb Minut per als teus dispositiu/s Point."
         },
         "error": {
-            "follow_link": "Si us plau seguiu l'enlla\u00e7 i autentiqueu-vos abans de pr\u00e9mer Enviar",
+            "follow_link": "Si us plau v\u00e9s a l'enlla\u00e7 i autentica't abans de pr\u00e9mer Enviar",
             "no_token": "No s'ha autenticat amb Minut"
         },
         "step": {
             "auth": {
-                "description": "Aneu a l'enlla\u00e7 seg\u00fcent i <b>Accepta</b> l'acc\u00e9s al vostre compte de Minut, despr\u00e9s torneu i premeu <b>Enviar</b> (a sota). \n\n[Enlla\u00e7]({authorization_url})",
+                "description": "V\u00e9s a l'enlla\u00e7 seg\u00fcent i <b>Accepta</b> l'acc\u00e9s al teu compte de Minut, despr\u00e9s torna i prem <b>Enviar</b> (a sota). \n\n[Enlla\u00e7]({authorization_url})",
                 "title": "Autenticar Point"
             },
             "user": {
                 "data": {
                     "flow_impl": "Prove\u00efdor"
                 },
-                "description": "Trieu a trav\u00e9s de quin prove\u00efdor d'autenticaci\u00f3 us voleu autenticar amb Point.",
+                "description": "Tria a trav\u00e9s de quin prove\u00efdor d'autenticaci\u00f3 vols autenticar-te amb Point.",
                 "title": "Prove\u00efdor d'autenticaci\u00f3"
             }
         },
diff --git a/homeassistant/components/point/.translations/hu.json b/homeassistant/components/point/.translations/hu.json
new file mode 100644
index 00000000000..2d52069d5ba
--- /dev/null
+++ b/homeassistant/components/point/.translations/hu.json
@@ -0,0 +1,17 @@
+{
+    "config": {
+        "step": {
+            "auth": {
+                "title": "Point hiteles\u00edt\u00e9se"
+            },
+            "user": {
+                "data": {
+                    "flow_impl": "Szolg\u00e1ltat\u00f3"
+                },
+                "description": "V\u00e1laszd ki, hogy melyik hiteles\u00edt\u00e9si szolg\u00e1ltat\u00f3n\u00e1l szeretn\u00e9d hiteles\u00edteni a Pointot.",
+                "title": "Hiteles\u00edt\u00e9si Szolg\u00e1ltat\u00f3"
+            }
+        },
+        "title": "Minut Point"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/point/.translations/ru.json b/homeassistant/components/point/.translations/ru.json
index 1257e1a7f01..7bcf275f96e 100644
--- a/homeassistant/components/point/.translations/ru.json
+++ b/homeassistant/components/point/.translations/ru.json
@@ -4,8 +4,12 @@
             "already_setup": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
             "authorize_url_fail": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
             "authorize_url_timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
+            "external_setup": "\u0422\u043e\u0447\u043a\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u0430 \u0438\u0437 \u0434\u0440\u0443\u0433\u043e\u0433\u043e \u043f\u043e\u0442\u043e\u043a\u0430.",
             "no_flows": "\u0412\u0430\u043c \u043d\u0443\u0436\u043d\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c Point \u043f\u0435\u0440\u0435\u0434 \u0442\u0435\u043c, \u043a\u0430\u043a \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044e. [\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0437\u043d\u0430\u043a\u043e\u043c\u044c\u0442\u0435\u0441\u044c \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043a\u0446\u0438\u044f\u043c\u0438](https://www.home-assistant.io/components/point/)."
         },
+        "create_entry": {
+            "default": "\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043f\u043e\u0434\u043b\u0438\u043d\u043d\u043e\u0441\u0442\u0438 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u0443\u0441\u043f\u0435\u0448\u043d\u043e"
+        },
         "error": {
             "follow_link": "\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u043f\u043e \u0441\u0441\u044b\u043b\u043a\u0435 \u0438 \u043f\u0440\u043e\u0439\u0434\u0438\u0442\u0435 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0443 \u043f\u043e\u0434\u043b\u0438\u043d\u043d\u043e\u0441\u0442\u0438, \u043f\u0440\u0435\u0436\u0434\u0435 \u0447\u0435\u043c \u043d\u0430\u0436\u0430\u0442\u044c \u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c",
             "no_token": "\u041d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d \u0432\u0445\u043e\u0434 \u0432 Minut"
diff --git a/homeassistant/components/rainmachine/.translations/ca.json b/homeassistant/components/rainmachine/.translations/ca.json
index 7a1459cff6b..60458f1469e 100644
--- a/homeassistant/components/rainmachine/.translations/ca.json
+++ b/homeassistant/components/rainmachine/.translations/ca.json
@@ -11,7 +11,7 @@
                     "password": "Contrasenya",
                     "port": "Port"
                 },
-                "title": "Introdu\u00efu la vostra informaci\u00f3"
+                "title": "Introdueix la teva informaci\u00f3"
             }
         },
         "title": "RainMachine"
diff --git a/homeassistant/components/rainmachine/__init__.py b/homeassistant/components/rainmachine/__init__.py
index 6e1b8b68437..4eb9e390d71 100644
--- a/homeassistant/components/rainmachine/__init__.py
+++ b/homeassistant/components/rainmachine/__init__.py
@@ -24,7 +24,7 @@ from .config_flow import configured_instances
 from .const import (
     DATA_CLIENT, DEFAULT_PORT, DEFAULT_SCAN_INTERVAL, DEFAULT_SSL, DOMAIN)
 
-REQUIREMENTS = ['regenmaschine==1.0.7']
+REQUIREMENTS = ['regenmaschine==1.1.0']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -164,8 +164,7 @@ async def async_setup_entry(hass, config_entry):
                 CONF_MONITORED_CONDITIONS, list(BINARY_SENSORS)),
             config_entry.data.get(CONF_SENSORS, {}).get(
                 CONF_MONITORED_CONDITIONS, list(SENSORS)),
-            config_entry.data.get(CONF_ZONE_RUN_TIME, DEFAULT_ZONE_RUN)
-        )
+            config_entry.data.get(CONF_ZONE_RUN_TIME, DEFAULT_ZONE_RUN))
         await rainmachine.async_update()
     except RainMachineError as err:
         _LOGGER.error('An error occurred: %s', err)
diff --git a/homeassistant/components/recorder/__init__.py b/homeassistant/components/recorder/__init__.py
index 15de4c3f995..4142e72337a 100644
--- a/homeassistant/components/recorder/__init__.py
+++ b/homeassistant/components/recorder/__init__.py
@@ -33,7 +33,7 @@ from . import migration, purge
 from .const import DATA_INSTANCE
 from .util import session_scope
 
-REQUIREMENTS = ['sqlalchemy==1.2.14']
+REQUIREMENTS = ['sqlalchemy==1.2.15']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/recorder/purge.py b/homeassistant/components/recorder/purge.py
index 4af2a62151f..17909194793 100644
--- a/homeassistant/components/recorder/purge.py
+++ b/homeassistant/components/recorder/purge.py
@@ -12,50 +12,19 @@ _LOGGER = logging.getLogger(__name__)
 def purge_old_data(instance, purge_days, repack):
     """Purge events and states older than purge_days ago."""
     from .models import States, Events
-    from sqlalchemy import func
 
     purge_before = dt_util.utcnow() - timedelta(days=purge_days)
     _LOGGER.debug("Purging events before %s", purge_before)
 
     with session_scope(session=instance.get_session()) as session:
-        delete_states = session.query(States) \
-                            .filter((States.last_updated < purge_before))
-
-        # For each entity, the most recent state is protected from deletion
-        # s.t. we can properly restore state even if the entity has not been
-        # updated in a long time
-        protected_states = session.query(func.max(States.state_id)) \
-            .group_by(States.entity_id).all()
-
-        protected_state_ids = tuple(state[0] for state in protected_states)
-
-        if protected_state_ids:
-            delete_states = delete_states \
-                .filter(~States.state_id.in_(protected_state_ids))
-
-        deleted_rows = delete_states.delete(synchronize_session=False)
+        deleted_rows = session.query(States) \
+            .filter((States.last_updated < purge_before)) \
+            .delete(synchronize_session=False)
         _LOGGER.debug("Deleted %s states", deleted_rows)
 
-        delete_events = session.query(Events) \
-            .filter((Events.time_fired < purge_before))
-
-        # We also need to protect the events belonging to the protected states.
-        # Otherwise, if the SQL server has "ON DELETE CASCADE" as default, it
-        # will delete the protected state when deleting its associated
-        # event. Also, we would be producing NULLed foreign keys otherwise.
-        if protected_state_ids:
-            protected_events = session.query(States.event_id) \
-                .filter(States.state_id.in_(protected_state_ids)) \
-                .filter(States.event_id.isnot(None)) \
-                .all()
-
-            protected_event_ids = tuple(state[0] for state in protected_events)
-
-            if protected_event_ids:
-                delete_events = delete_events \
-                    .filter(~Events.event_id.in_(protected_event_ids))
-
-        deleted_rows = delete_events.delete(synchronize_session=False)
+        deleted_rows = session.query(Events) \
+            .filter((Events.time_fired < purge_before)) \
+            .delete(synchronize_session=False)
         _LOGGER.debug("Deleted %s events", deleted_rows)
 
     # Execute sqlite vacuum command to free up space on disk
diff --git a/homeassistant/components/remote/__init__.py b/homeassistant/components/remote/__init__.py
index 4fc491e57e8..162cb41d92e 100644
--- a/homeassistant/components/remote/__init__.py
+++ b/homeassistant/components/remote/__init__.py
@@ -46,7 +46,7 @@ DEFAULT_NUM_REPEATS = 1
 DEFAULT_DELAY_SECS = 0.4
 
 REMOTE_SERVICE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
 })
 
 REMOTE_SERVICE_ACTIVITY_SCHEMA = REMOTE_SERVICE_SCHEMA.extend({
diff --git a/homeassistant/components/remote/harmony.py b/homeassistant/components/remote/harmony.py
index 0200a684099..4df471aa918 100644
--- a/homeassistant/components/remote/harmony.py
+++ b/homeassistant/components/remote/harmony.py
@@ -7,32 +7,28 @@ https://home-assistant.io/components/remote.harmony/
 import asyncio
 import json
 import logging
-from datetime import timedelta
-from pathlib import Path
 
 import voluptuous as vol
 
 from homeassistant.components import remote
 from homeassistant.components.remote import (
     ATTR_ACTIVITY, ATTR_DELAY_SECS, ATTR_DEVICE, ATTR_NUM_REPEATS,
-    DEFAULT_DELAY_SECS, DOMAIN, PLATFORM_SCHEMA)
+    DEFAULT_DELAY_SECS, DOMAIN, PLATFORM_SCHEMA
+)
 from homeassistant.const import (
-    ATTR_ENTITY_ID, CONF_HOST, CONF_NAME, CONF_PORT, EVENT_HOMEASSISTANT_STOP)
+    ATTR_ENTITY_ID, CONF_HOST, CONF_NAME, CONF_PORT, EVENT_HOMEASSISTANT_STOP
+)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.exceptions import PlatformNotReady
 from homeassistant.util import slugify
 
-# REQUIREMENTS = ['pyharmony==1.0.22']
-REQUIREMENTS = [
-    'https://github.com/home-assistant/pyharmony/archive/'
-    '31efd339a3c39e7b8f58e823a0eddb59013e03ae.zip'
-    '#pyharmony==1.0.21b1'
-]
+REQUIREMENTS = ['aioharmony==0.1.2']
 
 _LOGGER = logging.getLogger(__name__)
 
+ATTR_CURRENT_ACTIVITY = 'current_activity'
+
 DEFAULT_PORT = 8088
-SCAN_INTERVAL = timedelta(seconds=5)
 DEVICES = []
 CONF_DEVICE_CACHE = 'harmony_device_cache'
 
@@ -55,7 +51,6 @@ HARMONY_SYNC_SCHEMA = vol.Schema({
 async def async_setup_platform(hass, config, async_add_entities,
                                discovery_info=None):
     """Set up the Harmony platform."""
-    host = None
     activity = None
 
     if CONF_DEVICE_CACHE not in hass.data:
@@ -65,11 +60,11 @@ async def async_setup_platform(hass, config, async_add_entities,
         # Find the discovered device in the list of user configurations
         override = next((c for c in hass.data[CONF_DEVICE_CACHE]
                          if c.get(CONF_NAME) == discovery_info.get(CONF_NAME)),
-                        False)
+                        None)
 
         port = DEFAULT_PORT
         delay_secs = DEFAULT_DELAY_SECS
-        if override:
+        if override is not None:
             activity = override.get(ATTR_ACTIVITY)
             delay_secs = override.get(ATTR_DELAY_SECS)
             port = override.get(CONF_PORT, DEFAULT_PORT)
@@ -130,7 +125,6 @@ async def _apply_service(service, service_func, *service_func_args):
 
     for device in _devices:
         await service_func(device, *service_func_args)
-        device.schedule_update_ha_state(True)
 
 
 async def _sync_service(service):
@@ -142,39 +136,53 @@ class HarmonyRemote(remote.RemoteDevice):
 
     def __init__(self, name, host, port, activity, out_path, delay_secs):
         """Initialize HarmonyRemote class."""
-        import pyharmony.client as harmony_client
+        from aioharmony.harmonyapi import (
+            HarmonyAPI as HarmonyClient, ClientCallbackType
+        )
 
-        _LOGGER.debug("HarmonyRemote device init started for: %s", name)
+        _LOGGER.debug("%s: Device init started", name)
         self._name = name
         self.host = host
         self.port = port
         self._state = None
         self._current_activity = None
         self._default_activity = activity
-        # self._client = pyharmony.get_client(host, port, self.new_activity)
-        self._client = harmony_client.HarmonyClient(host)
+        self._client = HarmonyClient(
+            ip_address=host,
+            callbacks=ClientCallbackType(
+                new_activity=self.new_activity,
+                config_updated=self.new_config,
+                connect=self.got_connected,
+                disconnect=self.got_disconnected
+            )
+        )
         self._config_path = out_path
         self._delay_secs = delay_secs
-        _LOGGER.debug("HarmonyRemote device init completed for: %s", name)
+        self._available = False
 
     async def async_added_to_hass(self):
         """Complete the initialization."""
-        _LOGGER.debug("HarmonyRemote added for: %s", self._name)
+        _LOGGER.debug("%s: Harmony Hub added", self._name)
+        import aioharmony.exceptions as aioexc
 
-        async def shutdown(event):
+        async def shutdown(_):
             """Close connection on shutdown."""
-            await self._client.disconnect()
+            _LOGGER.debug("%s: Closing Harmony Hub", self._name)
+            try:
+                await self._client.close()
+            except aioexc.TimeOut:
+                _LOGGER.warning("%s: Disconnect timed-out", self._name)
 
         self.hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, shutdown)
 
-        _LOGGER.debug("Connecting.")
-        await self._client.connect()
-        await self._client.get_config()
-        if not Path(self._config_path).is_file():
-            self.write_config_file()
-
-        # Poll for initial state
-        self.new_activity(await self._client.get_current_activity())
+        _LOGGER.debug("%s: Connecting", self._name)
+        try:
+            await self._client.connect()
+        except aioexc.TimeOut:
+            _LOGGER.error("%s: Connection timed-out", self._name)
+        else:
+            # Set initial state
+            self.new_activity(self._client.current_activity)
 
     @property
     def name(self):
@@ -184,113 +192,189 @@ class HarmonyRemote(remote.RemoteDevice):
     @property
     def should_poll(self):
         """Return the fact that we should not be polled."""
-        return True
+        return False
 
     @property
     def device_state_attributes(self):
         """Add platform specific attributes."""
-        return {'current_activity': self._current_activity}
+        return {ATTR_CURRENT_ACTIVITY: self._current_activity}
 
     @property
     def is_on(self):
         """Return False if PowerOff is the current activity, otherwise True."""
         return self._current_activity not in [None, 'PowerOff']
 
-    async def async_update(self):
-        """Retrieve current activity from Hub."""
-        _LOGGER.debug("Updating Harmony.")
-        if not self._client.config:
-            await self._client.get_config()
+    @property
+    def available(self):
+        """Return True if connected to Hub, otherwise False."""
+        return self._available
 
-        activity_id = await self._client.get_current_activity()
-        activity_name = self._client.get_activity_name(activity_id)
-        _LOGGER.debug("%s activity reported as: %s", self._name, activity_name)
-        self._current_activity = activity_name
-        self._state = bool(self._current_activity != 'PowerOff')
-        return
-
-    def new_activity(self, activity_id):
+    def new_activity(self, activity_info: tuple) -> None:
         """Call for updating the current activity."""
-        activity_name = self._client.get_activity_name(activity_id)
-        _LOGGER.debug("%s activity reported as: %s", self._name, activity_name)
+        activity_id, activity_name = activity_info
+        _LOGGER.debug("%s: activity reported as: %s", self._name,
+                      activity_name)
         self._current_activity = activity_name
-        self._state = bool(self._current_activity != 'PowerOff')
-        self.schedule_update_ha_state()
+        self._state = bool(activity_id != -1)
+        self._available = True
+        self.async_schedule_update_ha_state()
+
+    async def new_config(self, _=None):
+        """Call for updating the current activity."""
+        _LOGGER.debug("%s: configuration has been updated", self._name)
+        self.new_activity(self._client.current_activity)
+        await self.hass.async_add_executor_job(self.write_config_file)
+
+    async def got_connected(self, _=None):
+        """Notification that we're connected to the HUB."""
+        _LOGGER.debug("%s: connected to the HUB.", self._name)
+        if not self._available:
+            # We were disconnected before.
+            await self.new_config()
+
+    async def got_disconnected(self, _=None):
+        """Notification that we're disconnected from the HUB."""
+        _LOGGER.debug("%s: disconnected from the HUB.", self._name)
+        self._available = False
+        # We're going to wait for 10 seconds before announcing we're
+        # unavailable, this to allow a reconnection to happen.
+        await asyncio.sleep(10)
+
+        if not self._available:
+            # Still disconnected. Let the state engine know.
+            self.async_schedule_update_ha_state()
 
     async def async_turn_on(self, **kwargs):
         """Start an activity from the Harmony device."""
+        import aioharmony.exceptions as aioexc
+
+        _LOGGER.debug("%s: Turn On", self.name)
+
         activity = kwargs.get(ATTR_ACTIVITY, self._default_activity)
 
         if activity:
             activity_id = None
             if activity.isdigit() or activity == '-1':
-                _LOGGER.debug("Activity is numeric")
+                _LOGGER.debug("%s: Activity is numeric", self.name)
                 if self._client.get_activity_name(int(activity)):
                     activity_id = activity
 
-            if not activity_id:
-                _LOGGER.debug("Find activity ID based on name")
+            if activity_id is None:
+                _LOGGER.debug("%s: Find activity ID based on name", self.name)
                 activity_id = self._client.get_activity_id(
                     str(activity).strip())
 
-            if not activity_id:
-                _LOGGER.error("Activity %s is invalid", activity)
+            if activity_id is None:
+                _LOGGER.error("%s: Activity %s is invalid",
+                              self.name, activity)
                 return
 
-            await self._client.start_activity(activity_id)
-            self._state = True
+            try:
+                await self._client.start_activity(activity_id)
+            except aioexc.TimeOut:
+                _LOGGER.error("%s: Starting activity %s timed-out",
+                              self.name,
+                              activity)
         else:
-            _LOGGER.error("No activity specified with turn_on service")
+            _LOGGER.error("%s: No activity specified with turn_on service",
+                          self.name)
 
     async def async_turn_off(self, **kwargs):
         """Start the PowerOff activity."""
-        await self._client.power_off()
+        import aioharmony.exceptions as aioexc
+        _LOGGER.debug("%s: Turn Off", self.name)
+        try:
+            await self._client.power_off()
+        except aioexc.TimeOut:
+            _LOGGER.error("%s: Powering off timed-out", self.name)
 
     # pylint: disable=arguments-differ
     async def async_send_command(self, command, **kwargs):
         """Send a list of commands to one device."""
+        from aioharmony.harmonyapi import SendCommandDevice
+        import aioharmony.exceptions as aioexc
+
+        _LOGGER.debug("%s: Send Command", self.name)
         device = kwargs.get(ATTR_DEVICE)
         if device is None:
-            _LOGGER.error("Missing required argument: device")
+            _LOGGER.error("%s: Missing required argument: device", self.name)
             return
 
         device_id = None
         if device.isdigit():
-            _LOGGER.debug("Device is numeric")
+            _LOGGER.debug("%s: Device %s is numeric",
+                          self.name, device)
             if self._client.get_device_name(int(device)):
                 device_id = device
 
-        if not device_id:
-            _LOGGER.debug("Find device ID based on device name")
-            device_id = self._client.get_activity_id(str(device).strip())
+        if device_id is None:
+            _LOGGER.debug("%s: Find device ID %s based on device name",
+                          self.name, device)
+            device_id = self._client.get_device_id(str(device).strip())
 
-        if not device_id:
-            _LOGGER.error("Device  %s is invalid", device)
+        if device_id is None:
+            _LOGGER.error("%s: Device %s is invalid", self.name, device)
             return
 
         num_repeats = kwargs.get(ATTR_NUM_REPEATS)
         delay_secs = kwargs.get(ATTR_DELAY_SECS, self._delay_secs)
 
+        # Creating list of commands to send.
+        snd_cmnd_list = []
         for _ in range(num_repeats):
             for single_command in command:
-                _LOGGER.debug("Sending command %s", single_command)
-                await self._client.send_command(device, single_command)
-                await asyncio.sleep(delay_secs)
+                send_command = SendCommandDevice(
+                    device=device,
+                    command=single_command,
+                    delay=0
+                )
+                snd_cmnd_list.append(send_command)
+                if delay_secs > 0:
+                    snd_cmnd_list.append(float(delay_secs))
+
+        _LOGGER.debug("%s: Sending commands", self.name)
+        try:
+            result_list = await self._client.send_commands(snd_cmnd_list)
+        except aioexc.TimeOut:
+            _LOGGER.error("%s: Sending commands timed-out", self.name)
+            return
+
+        for result in result_list:
+            _LOGGER.error("Sending command %s to device %s failed with code "
+                          "%s: %s",
+                          result.command.command,
+                          result.command.device,
+                          result.command.code,
+                          result.command.msg
+                          )
 
     async def sync(self):
         """Sync the Harmony device with the web service."""
-        _LOGGER.debug("Syncing hub with Harmony servers")
-        await self._client.sync()
-        await self._client.get_config()
-        await self.hass.async_add_executor_job(self.write_config_file)
+        import aioharmony.exceptions as aioexc
+
+        _LOGGER.debug("%s: Syncing hub with Harmony cloud", self.name)
+        try:
+            await self._client.sync()
+        except aioexc.TimeOut:
+            _LOGGER.error("%s: Syncing hub with Harmony cloud timed-out",
+                          self.name)
+        else:
+            await self.hass.async_add_executor_job(self.write_config_file)
 
     def write_config_file(self):
         """Write Harmony configuration file."""
-        _LOGGER.debug("Writing hub config to file: %s", self._config_path)
+        _LOGGER.debug("%s: Writing hub config to file: %s",
+                      self.name,
+                      self._config_path)
+        if self._client.config is None:
+            _LOGGER.warning("%s: No configuration received from hub",
+                            self.name)
+            return
+
         try:
             with open(self._config_path, 'w+', encoding='utf-8') as file_out:
                 json.dump(self._client.json_config, file_out,
                           sort_keys=True, indent=4)
         except IOError as exc:
-            _LOGGER.error("Unable to write HUB configuration to %s: %s",
-                          self._config_path, exc)
+            _LOGGER.error("%s: Unable to write HUB configuration to %s: %s",
+                          self.name, self._config_path, exc)
diff --git a/homeassistant/components/rflink.py b/homeassistant/components/rflink.py
index b3c58da1076..b91ff251bd1 100644
--- a/homeassistant/components/rflink.py
+++ b/homeassistant/components/rflink.py
@@ -13,7 +13,7 @@ import voluptuous as vol
 
 from homeassistant.const import (
     ATTR_ENTITY_ID, CONF_COMMAND, CONF_HOST, CONF_PORT,
-    EVENT_HOMEASSISTANT_STOP)
+    STATE_ON, EVENT_HOMEASSISTANT_STOP)
 from homeassistant.core import CoreState, callback
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv
@@ -21,7 +21,7 @@ from homeassistant.helpers.deprecation import get_deprecated
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_send, async_dispatcher_connect)
-
+from homeassistant.helpers.restore_state import RestoreEntity
 
 REQUIREMENTS = ['rflink==0.0.37']
 
@@ -178,7 +178,7 @@ async def async_setup(hass, config):
                 _LOGGER.debug('device_id not known, adding new device')
                 # Add bogus event_id first to avoid race if we get another
                 # event before the device is created
-                # Any additional events recevied before the device has been
+                # Any additional events received before the device has been
                 # created will thus be ignored.
                 hass.data[DATA_ENTITY_LOOKUP][event_type][
                     event_id].append(TMP_ENTITY.format(event_id))
@@ -348,9 +348,9 @@ class RflinkDevice(Entity):
         # Remove temporary bogus entity_id if added
         tmp_entity = TMP_ENTITY.format(self._device_id)
         if tmp_entity in self.hass.data[DATA_ENTITY_LOOKUP][
-                EVENT_KEY_SENSOR][self._device_id]:
+                EVENT_KEY_COMMAND][self._device_id]:
             self.hass.data[DATA_ENTITY_LOOKUP][
-                EVENT_KEY_SENSOR][self._device_id].remove(tmp_entity)
+                EVENT_KEY_COMMAND][self._device_id].remove(tmp_entity)
 
         # Register id and aliases
         self.hass.data[DATA_ENTITY_LOOKUP][
@@ -499,9 +499,17 @@ class RflinkCommand(RflinkDevice):
                 self._async_send_command(cmd, repetitions - 1))
 
 
-class SwitchableRflinkDevice(RflinkCommand):
+class SwitchableRflinkDevice(RflinkCommand, RestoreEntity):
     """Rflink entity which can switch on/off (eg: light, switch)."""
 
+    async def async_added_to_hass(self):
+        """Restore RFLink device state (ON/OFF)."""
+        await super().async_added_to_hass()
+
+        old_state = await self.async_get_last_state()
+        if old_state is not None:
+            self._state = old_state.state == STATE_ON
+
     def _handle_event(self, event):
         """Adjust state if Rflink picks up a remote command for this device."""
         self.cancel_queued_send_commands()
diff --git a/homeassistant/components/rpi_gpio.py b/homeassistant/components/rpi_gpio.py
index 09521803aa9..5f52341f1cb 100644
--- a/homeassistant/components/rpi_gpio.py
+++ b/homeassistant/components/rpi_gpio.py
@@ -9,7 +9,7 @@ import logging
 from homeassistant.const import (
     EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP)
 
-REQUIREMENTS = ['RPi.GPIO==0.6.1']
+REQUIREMENTS = ['RPi.GPIO==0.6.5']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/satel_integra.py b/homeassistant/components/satel_integra.py
index 8d7d1e619db..25295c6f2ce 100644
--- a/homeassistant/components/satel_integra.py
+++ b/homeassistant/components/satel_integra.py
@@ -19,7 +19,7 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.discovery import async_load_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
-REQUIREMENTS = ['satel_integra==0.1.0']
+REQUIREMENTS = ['satel_integra==0.2.0']
 
 DEFAULT_ALARM_NAME = 'satel_integra'
 DEFAULT_PORT = 7094
@@ -40,6 +40,7 @@ CONF_ARM_HOME_MODE = 'arm_home_mode'
 CONF_ZONE_NAME = 'name'
 CONF_ZONE_TYPE = 'type'
 CONF_ZONES = 'zones'
+CONF_OUTPUTS = 'outputs'
 
 ZONES = 'zones'
 
@@ -49,6 +50,7 @@ SIGNAL_PANEL_ARM_HOME = 'satel_integra.panel_arm_home'
 SIGNAL_PANEL_DISARM = 'satel_integra.panel_disarm'
 
 SIGNAL_ZONES_UPDATED = 'satel_integra.zones_updated'
+SIGNAL_OUTPUTS_UPDATED = 'satel_integra.outputs_updated'
 
 ZONE_SCHEMA = vol.Schema({
     vol.Required(CONF_ZONE_NAME): cv.string,
@@ -62,7 +64,10 @@ CONFIG_SCHEMA = vol.Schema({
                      default=DEFAULT_DEVICE_PARTITION): cv.positive_int,
         vol.Optional(CONF_ARM_HOME_MODE,
                      default=DEFAULT_CONF_ARM_HOME_MODE): vol.In([1, 2, 3]),
-        vol.Optional(CONF_ZONES): {vol.Coerce(int): ZONE_SCHEMA},
+        vol.Optional(CONF_ZONES,
+                     default={}): {vol.Coerce(int): ZONE_SCHEMA},
+        vol.Optional(CONF_OUTPUTS,
+                     default={}): {vol.Coerce(int): ZONE_SCHEMA},
     }),
 }, extra=vol.ALLOW_EXTRA)
 
@@ -72,13 +77,14 @@ async def async_setup(hass, config):
     conf = config.get(DOMAIN)
 
     zones = conf.get(CONF_ZONES)
+    outputs = conf.get(CONF_OUTPUTS)
     host = conf.get(CONF_DEVICE_HOST)
     port = conf.get(CONF_DEVICE_PORT)
     partition = conf.get(CONF_DEVICE_PARTITION)
 
     from satel_integra.satel_integra import AsyncSatel, AlarmState
 
-    controller = AsyncSatel(host, port, zones, hass.loop, partition)
+    controller = AsyncSatel(host, port, hass.loop, zones, outputs, partition)
 
     hass.data[DATA_SATEL] = controller
 
@@ -101,7 +107,8 @@ async def async_setup(hass, config):
 
     task_zones = hass.async_create_task(
         async_load_platform(hass, 'binary_sensor', DOMAIN,
-                            {CONF_ZONES: zones}, config))
+                            {CONF_ZONES: zones, CONF_OUTPUTS: outputs}, config)
+        )
 
     await asyncio.wait([task_control_panel, task_zones], loop=hass.loop)
 
@@ -134,16 +141,23 @@ async def async_setup(hass, config):
     @callback
     def zones_update_callback(status):
         """Update zone objects as per notification from the alarm."""
-        _LOGGER.debug("Zones callback , status: %s", status)
+        _LOGGER.debug("Zones callback, status: %s", status)
         async_dispatcher_send(hass, SIGNAL_ZONES_UPDATED, status[ZONES])
 
+    @callback
+    def outputs_update_callback(status):
+        """Update zone objects as per notification from the alarm."""
+        _LOGGER.debug("Outputs updated callback , status: %s", status)
+        async_dispatcher_send(hass, SIGNAL_OUTPUTS_UPDATED, status["outputs"])
+
     # Create a task instead of adding a tracking job, since this task will
     # run until the connection to satel_integra is closed.
     hass.loop.create_task(controller.keep_alive())
     hass.loop.create_task(
         controller.monitor_status(
             alarm_status_update_callback,
-            zones_update_callback)
+            zones_update_callback,
+            outputs_update_callback)
     )
 
     return True
diff --git a/homeassistant/components/scene/__init__.py b/homeassistant/components/scene/__init__.py
index 2bcb1c8e16d..b3ab5228875 100644
--- a/homeassistant/components/scene/__init__.py
+++ b/homeassistant/components/scene/__init__.py
@@ -56,7 +56,7 @@ PLATFORM_SCHEMA = vol.Schema(
     ), extra=vol.ALLOW_EXTRA)
 
 SCENE_SERVICE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Required(ATTR_ENTITY_ID): cv.entity_ids,
 })
 
 
diff --git a/homeassistant/components/scene/lutron.py b/homeassistant/components/scene/lutron.py
new file mode 100644
index 00000000000..bdb8bc344fe
--- /dev/null
+++ b/homeassistant/components/scene/lutron.py
@@ -0,0 +1,53 @@
+"""
+Support for Lutron scenes.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/scene.lutron/
+"""
+import logging
+
+from homeassistant.components.lutron import (
+    LutronDevice, LUTRON_DEVICES, LUTRON_CONTROLLER)
+from homeassistant.components.scene import Scene
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['lutron']
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the Lutron scenes."""
+    devs = []
+    for scene_data in hass.data[LUTRON_DEVICES]['scene']:
+        (area_name, keypad_name, device, led) = scene_data
+        dev = LutronScene(area_name, keypad_name, device, led,
+                          hass.data[LUTRON_CONTROLLER])
+        devs.append(dev)
+
+    add_entities(devs, True)
+
+
+class LutronScene(LutronDevice, Scene):
+    """Representation of a Lutron Scene."""
+
+    def __init__(self,
+                 area_name,
+                 keypad_name,
+                 lutron_device,
+                 lutron_led,
+                 controller):
+        """Initialize the scene/button."""
+        super().__init__(area_name, lutron_device, controller)
+        self._keypad_name = keypad_name
+        self._led = lutron_led
+
+    def activate(self):
+        """Activate the scene."""
+        self._lutron_device.press()
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return "{} {}: {}".format(self._area_name,
+                                  self._keypad_name,
+                                  self._lutron_device.name)
diff --git a/homeassistant/components/sensor/aftership.py b/homeassistant/components/sensor/aftership.py
new file mode 100644
index 00000000000..eb5188a95cb
--- /dev/null
+++ b/homeassistant/components/sensor/aftership.py
@@ -0,0 +1,128 @@
+"""
+Support for non-delivered packages recorded in AfterShip.
+
+For more details about this platform, please refer to the documentation at
+https://www.home-assistant.io/components/sensor.aftership/
+"""
+from datetime import timedelta
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.const import ATTR_ATTRIBUTION, CONF_API_KEY, CONF_NAME
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity import Entity
+from homeassistant.util import Throttle
+
+REQUIREMENTS = ['pyaftership==0.1.2']
+
+_LOGGER = logging.getLogger(__name__)
+
+ATTRIBUTION = 'Information provided by AfterShip'
+
+CONF_SLUG = 'slug'
+CONF_TITLE = 'title'
+CONF_TRACKING_NUMBER = 'tracking_number'
+
+DEFAULT_NAME = 'aftership'
+
+ICON = 'mdi:package-variant-closed'
+
+MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=30)
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_API_KEY): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+})
+
+
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
+    """Set up the AfterShip sensor platform."""
+    from pyaftership.tracker import Tracking
+
+    apikey = config[CONF_API_KEY]
+    name = config[CONF_NAME]
+
+    session = async_get_clientsession(hass)
+    aftership = Tracking(hass.loop, session, apikey)
+
+    await aftership.get_trackings()
+
+    if not aftership.meta or aftership.meta['code'] != 200:
+        _LOGGER.error("No tracking data found. Check API key is correct: %s",
+                      aftership.meta)
+        return
+
+    async_add_entities([AfterShipSensor(aftership, name)], True)
+
+
+class AfterShipSensor(Entity):
+    """Representation of a AfterShip sensor."""
+
+    def __init__(self, aftership, name):
+        """Initialize the sensor."""
+        self._attributes = {}
+        self._name = name
+        self._state = None
+        self.aftership = aftership
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement of this entity, if any."""
+        return 'packages'
+
+    @property
+    def device_state_attributes(self):
+        """Return attributes for the sensor."""
+        return self._attributes
+
+    @property
+    def icon(self):
+        """Icon to use in the frontend."""
+        return ICON
+
+    @Throttle(MIN_TIME_BETWEEN_UPDATES)
+    async def async_update(self):
+        """Get the latest data from the AfterShip API."""
+        await self.aftership.get_trackings()
+
+        if not self.aftership.meta:
+            _LOGGER.error("Unknown errors when querying")
+            return
+        if self.aftership.meta['code'] != 200:
+            _LOGGER.error(
+                "Errors when querying AfterShip. %s", str(self.aftership.meta))
+            return
+
+        status_to_ignore = {'delivered'}
+        status_counts = {}
+        not_delivered_count = 0
+
+        for tracking in self.aftership.trackings['trackings']:
+            status = tracking['tag'].lower()
+            name = tracking['tracking_number']
+            status_counts[status] = status_counts.get(status, 0)+1
+            if status not in status_to_ignore:
+                not_delivered_count += 1
+            else:
+                _LOGGER.debug("Ignoring %s as it has status: %s", name, status)
+
+        self._attributes = {
+            ATTR_ATTRIBUTION: ATTRIBUTION,
+            **status_counts
+        }
+
+        self._state = not_delivered_count
diff --git a/homeassistant/components/sensor/ambient_station.py b/homeassistant/components/sensor/ambient_station.py
new file mode 100644
index 00000000000..0dfbbb63244
--- /dev/null
+++ b/homeassistant/components/sensor/ambient_station.py
@@ -0,0 +1,212 @@
+"""
+Support for Ambient Weather Station Service.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/sensor.ambient_station/
+"""
+
+import asyncio
+from datetime import timedelta
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.const import CONF_API_KEY, CONF_MONITORED_CONDITIONS
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity import Entity
+from homeassistant.util import Throttle
+
+REQUIREMENTS = ['ambient_api==1.5.2']
+
+CONF_APP_KEY = 'app_key'
+
+SENSOR_NAME = 0
+SENSOR_UNITS = 1
+
+CONF_UNITS = 'units'
+UNITS_US = 'us'
+UNITS_SI = 'si'
+UNIT_SYSTEM = {UNITS_US: 0, UNITS_SI: 1}
+
+SCAN_INTERVAL = timedelta(seconds=300)
+
+SENSOR_TYPES = {
+    'winddir': ['Wind Dir', 'º'],
+    'windspeedmph': ['Wind Speed', 'mph'],
+    'windgustmph': ['Wind Gust', 'mph'],
+    'maxdailygust': ['Max Gust', 'mph'],
+    'windgustdir': ['Gust Dir', 'º'],
+    'windspdmph_avg2m': ['Wind Avg 2m', 'mph'],
+    'winddir_avg2m': ['Wind Dir Avg 2m', 'mph'],
+    'windspdmph_avg10m': ['Wind Avg 10m', 'mph'],
+    'winddir_avg10m': ['Wind Dir Avg 10m', 'º'],
+    'humidity': ['Humidity', '%'],
+    'humidityin': ['Humidity In', '%'],
+    'tempf': ['Temp', ['ºF', 'ºC']],
+    'tempinf': ['Inside Temp', ['ºF', 'ºC']],
+    'battout': ['Battery', ''],
+    'hourlyrainin': ['Hourly Rain Rate', 'in/hr'],
+    'dailyrainin': ['Daily Rain', 'in'],
+    '24hourrainin': ['24 Hr Rain', 'in'],
+    'weeklyrainin': ['Weekly Rain', 'in'],
+    'monthlyrainin': ['Monthly Rain', 'in'],
+    'yearlyrainin': ['Yearly Rain', 'in'],
+    'eventrainin': ['Event Rain', 'in'],
+    'totalrainin': ['Lifetime Rain', 'in'],
+    'baromrelin': ['Rel Pressure', 'inHg'],
+    'baromabsin': ['Abs Pressure', 'inHg'],
+    'uv': ['uv', 'Index'],
+    'solarradiation': ['Solar Rad', 'W/m^2'],
+    'co2': ['co2', 'ppm'],
+    'lastRain': ['Last Rain', ''],
+    'dewPoint': ['Dew Point', ['ºF', 'ºC']],
+    'feelsLike': ['Feels Like', ['ºF', 'ºC']],
+}
+
+_LOGGER = logging.getLogger(__name__)
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_API_KEY): cv.string,
+    vol.Required(CONF_APP_KEY): cv.string,
+    vol.Required(CONF_MONITORED_CONDITIONS):
+        vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
+    vol.Optional(CONF_UNITS): vol.In([UNITS_SI, UNITS_US]),
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Initialze each sensor platform for each monitored condition."""
+    api_key = config[CONF_API_KEY]
+    app_key = config[CONF_APP_KEY]
+    station_data = AmbientStationData(hass, api_key, app_key)
+    if not station_data.connect_success:
+        _LOGGER.error("Could not connect to weather station API")
+        return
+
+    sensor_list = []
+
+    if CONF_UNITS in config:
+        sys_units = config[CONF_UNITS]
+    elif hass.config.units.is_metric:
+        sys_units = UNITS_SI
+    else:
+        sys_units = UNITS_US
+
+    for condition in config[CONF_MONITORED_CONDITIONS]:
+        # create a sensor object for each monitored condition
+        sensor_params = SENSOR_TYPES[condition]
+        name = sensor_params[SENSOR_NAME]
+        units = sensor_params[SENSOR_UNITS]
+        if isinstance(units, list):
+            units = sensor_params[SENSOR_UNITS][UNIT_SYSTEM[sys_units]]
+
+        sensor_list.append(AmbientWeatherSensor(station_data, condition,
+                                                name, units))
+
+    add_entities(sensor_list)
+
+
+class AmbientWeatherSensor(Entity):
+    """Representation of a Sensor."""
+
+    def __init__(self, station_data, condition, name, units):
+        """Initialize the sensor."""
+        self._state = None
+        self.station_data = station_data
+        self._condition = condition
+        self._name = name
+        self._units = units
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        return self._units
+
+    async def async_update(self):
+        """Fetch new state data for the sensor.
+
+        This is the only method that should fetch new data for Home Assistant.
+        """
+        _LOGGER.debug("Getting data for sensor: %s", self._name)
+        data = await self.station_data.get_data()
+        if data is None:
+            # update likely got throttled and returned None, so use the cached
+            # data from the station_data object
+            self._state = self.station_data.data[self._condition]
+        else:
+            if self._condition in data:
+                self._state = data[self._condition]
+            else:
+                _LOGGER.warning("%s sensor data not available from the "
+                                "station", self._condition)
+
+        _LOGGER.debug("Sensor: %s | Data: %s", self._name, self._state)
+
+
+class AmbientStationData:
+    """Class to interface with ambient-api library."""
+
+    def __init__(self, hass, api_key, app_key):
+        """Initialize station data object."""
+        self.hass = hass
+        self._api_keys = {
+            'AMBIENT_ENDPOINT':
+            'https://api.ambientweather.net/v1',
+            'AMBIENT_API_KEY': api_key,
+            'AMBIENT_APPLICATION_KEY': app_key,
+            'log_level': 'DEBUG'
+        }
+
+        self.data = None
+        self._station = None
+        self._api = None
+        self._devices = None
+        self.connect_success = False
+
+        self.get_data = Throttle(SCAN_INTERVAL)(self.async_update)
+        self._connect_api()     # attempt to connect to API
+
+    async def async_update(self):
+        """Get new data."""
+        # refresh API connection since servers turn over nightly
+        _LOGGER.debug("Getting new data from server")
+        new_data = None
+        await self.hass.async_add_executor_job(self._connect_api)
+        await asyncio.sleep(2)   # need minimum 2 seconds between API calls
+        if self._station is not None:
+            data = await self.hass.async_add_executor_job(
+                self._station.get_data)
+            if data is not None:
+                new_data = data[0]
+                self.data = new_data
+            else:
+                _LOGGER.debug("data is None type")
+        else:
+            _LOGGER.debug("Station is None type")
+
+        return new_data
+
+    def _connect_api(self):
+        """Connect to the API and capture new data."""
+        from ambient_api.ambientapi import AmbientAPI
+
+        self._api = AmbientAPI(**self._api_keys)
+        self._devices = self._api.get_devices()
+
+        if self._devices:
+            self._station = self._devices[0]
+            if self._station is not None:
+                self.connect_success = True
+        else:
+            _LOGGER.debug("No station devices available")
diff --git a/homeassistant/components/sensor/awair.py b/homeassistant/components/sensor/awair.py
index bce0acb5141..9a45cb66a86 100644
--- a/homeassistant/components/sensor/awair.py
+++ b/homeassistant/components/sensor/awair.py
@@ -215,6 +215,10 @@ class AwairData:
     async def _async_update(self):
         """Get the data from Awair API."""
         resp = await self._client.air_data_latest(self._uuid)
+
+        if not resp:
+            return
+
         timestamp = dt.parse_datetime(resp[0][ATTR_TIMESTAMP])
         self.attrs[ATTR_LAST_API_UPDATE] = timestamp
         self.data[ATTR_SCORE] = resp[0][ATTR_SCORE]
diff --git a/homeassistant/components/sensor/bme680.py b/homeassistant/components/sensor/bme680.py
index cbcb7f1080e..2fa592bf864 100644
--- a/homeassistant/components/sensor/bme680.py
+++ b/homeassistant/components/sensor/bme680.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 from homeassistant.helpers.entity import Entity
 from homeassistant.util.temperature import celsius_to_fahrenheit
 
-REQUIREMENTS = ['bme680==1.0.4',
+REQUIREMENTS = ['bme680==1.0.5',
                 'smbus-cffi==0.5.1']
 
 _LOGGER = logging.getLogger(__name__)
@@ -36,6 +36,7 @@ CONF_GAS_HEATER_DURATION = 'gas_heater_duration'
 CONF_AQ_BURN_IN_TIME = 'aq_burn_in_time'
 CONF_AQ_HUM_BASELINE = 'aq_humidity_baseline'
 CONF_AQ_HUM_WEIGHTING = 'aq_humidity_bias'
+CONF_TEMP_OFFSET = 'temp_offset'
 
 
 DEFAULT_NAME = 'BME680 Sensor'
@@ -50,6 +51,7 @@ DEFAULT_GAS_HEATER_DURATION = 150  # Heater duration in ms 1 - 4032
 DEFAULT_AQ_BURN_IN_TIME = 300  # 300 second burn in time for AQ gas measurement
 DEFAULT_AQ_HUM_BASELINE = 40  # 40%, an optimal indoor humidity.
 DEFAULT_AQ_HUM_WEIGHTING = 25  # 25% Weighting of humidity to gas in AQ score
+DEFAULT_TEMP_OFFSET = 0  # No calibration out of the box.
 
 SENSOR_TEMP = 'temperature'
 SENSOR_HUMID = 'humidity'
@@ -93,6 +95,8 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
         vol.All(vol.Coerce(int), vol.Range(1, 100)),
     vol.Optional(CONF_AQ_HUM_WEIGHTING, default=DEFAULT_AQ_HUM_WEIGHTING):
         vol.All(vol.Coerce(int), vol.Range(1, 100)),
+    vol.Optional(CONF_TEMP_OFFSET, default=DEFAULT_TEMP_OFFSET):
+        vol.All(vol.Coerce(float), vol.Range(-100.0, 100.0)),
 })
 
 
@@ -140,6 +144,9 @@ def _setup_bme680(config):
         sensor.set_temperature_oversample(
             os_lookup[config.get(CONF_OVERSAMPLING_TEMP)]
         )
+        sensor.set_temp_offset(
+            config.get(CONF_TEMP_OFFSET)
+        )
         sensor.set_humidity_oversample(
             os_lookup[config.get(CONF_OVERSAMPLING_HUM)]
         )
@@ -179,10 +186,8 @@ def _setup_bme680(config):
 
     sensor_handler = BME680Handler(
         sensor,
-        True if (
-            SENSOR_GAS in config[CONF_MONITORED_CONDITIONS] or
-            SENSOR_AQ in config[CONF_MONITORED_CONDITIONS]
-        ) else False,
+        (SENSOR_GAS in config[CONF_MONITORED_CONDITIONS] or
+         SENSOR_AQ in config[CONF_MONITORED_CONDITIONS]),
         config[CONF_AQ_BURN_IN_TIME],
         config[CONF_AQ_HUM_BASELINE],
         config[CONF_AQ_HUM_WEIGHTING]
diff --git a/homeassistant/components/sensor/brottsplatskartan.py b/homeassistant/components/sensor/brottsplatskartan.py
new file mode 100644
index 00000000000..dc338e6b84a
--- /dev/null
+++ b/homeassistant/components/sensor/brottsplatskartan.py
@@ -0,0 +1,112 @@
+"""
+Sensor platform for Brottsplatskartan information.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/sensor.brottsplatskartan/
+"""
+from collections import defaultdict
+from datetime import timedelta
+import logging
+import uuid
+
+import voluptuous as vol
+
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.const import (
+    ATTR_ATTRIBUTION, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME)
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity import Entity
+
+REQUIREMENTS = ['brottsplatskartan==0.0.1']
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_AREA = 'area'
+
+DEFAULT_NAME = 'Brottsplatskartan'
+
+SCAN_INTERVAL = timedelta(minutes=30)
+
+AREAS = [
+    "Blekinge län", "Dalarnas län", "Gotlands län", "Gävleborgs län",
+    "Hallands län", "Jämtlands län", "Jönköpings län", "Kalmar län",
+    "Kronobergs län", "Norrbottens län", "Skåne län", "Stockholms län",
+    "Södermanlands län", "Uppsala län", "Värmlands län", "Västerbottens län",
+    "Västernorrlands län", "Västmanlands län", "Västra Götalands län",
+    "Örebro län", "Östergötlands län"
+]
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Inclusive(CONF_LATITUDE, 'coordinates'): cv.latitude,
+    vol.Inclusive(CONF_LONGITUDE, 'coordinates'): cv.longitude,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+    vol.Optional(CONF_AREA, default=[]):
+        vol.All(cv.ensure_list, [vol.In(AREAS)]),
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the Brottsplatskartan platform."""
+    import brottsplatskartan
+
+    area = config.get(CONF_AREA)
+    latitude = config.get(CONF_LATITUDE, hass.config.latitude)
+    longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
+    name = config.get(CONF_NAME)
+
+    # Every Home Assistant instance should have their own unique
+    # app parameter: https://brottsplatskartan.se/sida/api
+    app = 'ha-{}'.format(uuid.getnode())
+
+    bpk = brottsplatskartan.BrottsplatsKartan(
+        app=app, area=area, latitude=latitude, longitude=longitude)
+
+    add_entities([BrottsplatskartanSensor(bpk, name)], True)
+
+
+class BrottsplatskartanSensor(Entity):
+    """Representation of a Brottsplatskartan Sensor."""
+
+    def __init__(self, bpk, name):
+        """Initialize the Brottsplatskartan sensor."""
+        import brottsplatskartan
+        self._attributes = {ATTR_ATTRIBUTION: brottsplatskartan.ATTRIBUTION}
+        self._brottsplatskartan = bpk
+        self._name = name
+        self._previous_incidents = set()
+        self._state = None
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        return self._attributes
+
+    def update(self):
+        """Update device state."""
+        incident_counts = defaultdict(int)
+        incidents = self._brottsplatskartan.get_incidents()
+
+        if incidents is False:
+            _LOGGER.debug("Problems fetching incidents")
+            return
+
+        if len(incidents) < len(self._previous_incidents):
+            self._previous_incidents = set()
+
+        for incident in incidents:
+            incident_type = incident.get('title_type')
+            incident_counts[incident_type] += 1
+            self._previous_incidents.add(incident.get('id'))
+
+        self._attributes.update(incident_counts)
+        self._state = len(incidents)
diff --git a/homeassistant/components/sensor/cert_expiry.py b/homeassistant/components/sensor/cert_expiry.py
index df48ebbf41c..a04a631f2e9 100644
--- a/homeassistant/components/sensor/cert_expiry.py
+++ b/homeassistant/components/sensor/cert_expiry.py
@@ -85,8 +85,10 @@ class SSLCertificate(Entity):
         """Fetch the certificate information."""
         try:
             ctx = ssl.create_default_context()
+            host_info = socket.getaddrinfo(self.server_name, self.server_port)
+            family = host_info[0][0]
             sock = ctx.wrap_socket(
-                socket.socket(), server_hostname=self.server_name)
+                socket.socket(family=family), server_hostname=self.server_name)
             sock.settimeout(TIMEOUT)
             sock.connect((self.server_name, self.server_port))
         except socket.gaierror:
diff --git a/homeassistant/components/sensor/daikin.py b/homeassistant/components/sensor/daikin.py
index eae0c6e9614..f887ccf64a0 100644
--- a/homeassistant/components/sensor/daikin.py
+++ b/homeassistant/components/sensor/daikin.py
@@ -6,52 +6,33 @@ https://home-assistant.io/components/sensor.daikin/
 """
 import logging
 
-import voluptuous as vol
-
-import homeassistant.helpers.config_validation as cv
-from homeassistant.components.daikin import (
-    SENSOR_TYPES, SENSOR_TYPE_TEMPERATURE,
-    ATTR_INSIDE_TEMPERATURE, ATTR_OUTSIDE_TEMPERATURE,
-    daikin_api_setup
-)
-from homeassistant.components.sensor import PLATFORM_SCHEMA
-from homeassistant.const import (
-    CONF_HOST, CONF_ICON, CONF_NAME, CONF_MONITORED_CONDITIONS, CONF_TYPE
-)
+from homeassistant.components.daikin import DOMAIN as DAIKIN_DOMAIN
+from homeassistant.components.daikin.const import (
+    ATTR_INSIDE_TEMPERATURE, ATTR_OUTSIDE_TEMPERATURE, SENSOR_TYPE_TEMPERATURE,
+    SENSOR_TYPES)
+from homeassistant.const import CONF_ICON, CONF_NAME, CONF_TYPE
 from homeassistant.helpers.entity import Entity
 from homeassistant.util.unit_system import UnitSystem
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
-    vol.Required(CONF_HOST): cv.string,
-    vol.Optional(CONF_NAME): cv.string,
-    vol.Optional(CONF_MONITORED_CONDITIONS, default=list(SENSOR_TYPES)):
-        vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
-})
-
 _LOGGER = logging.getLogger(__name__)
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Daikin sensors."""
-    if discovery_info is not None:
-        host = discovery_info.get('ip')
-        name = None
-        monitored_conditions = discovery_info.get(
-            CONF_MONITORED_CONDITIONS, list(SENSOR_TYPES.keys())
-        )
-    else:
-        host = config[CONF_HOST]
-        name = config.get(CONF_NAME)
-        monitored_conditions = config[CONF_MONITORED_CONDITIONS]
-        _LOGGER.info("Added Daikin AC sensor on %s", host)
+    """Old way of setting up the Daikin sensors.
 
-    api = daikin_api_setup(hass, host, name)
-    units = hass.config.units
-    sensors = []
-    for monitored_state in monitored_conditions:
-        sensors.append(DaikinClimateSensor(api, monitored_state, units, name))
+    Can only be called when a user accidentally mentions the platform in their
+    config. But even in that case it would have been ignored.
+    """
+    pass
 
-    add_entities(sensors, True)
+
+async def async_setup_entry(hass, entry, async_add_entities):
+    """Set up Daikin climate based on config_entry."""
+    daikin_api = hass.data[DAIKIN_DOMAIN].get(entry.entry_id)
+    async_add_entities([
+        DaikinClimateSensor(daikin_api, sensor, hass.config.units)
+        for sensor in SENSOR_TYPES
+    ])
 
 
 class DaikinClimateSensor(Entity):
@@ -123,3 +104,8 @@ class DaikinClimateSensor(Entity):
     def update(self):
         """Retrieve latest state."""
         self._api.update()
+
+    @property
+    def device_info(self):
+        """Return a device description for device registry."""
+        return self._api.device_info
diff --git a/homeassistant/components/sensor/darksky.py b/homeassistant/components/sensor/darksky.py
index d4546d7b721..06284028457 100644
--- a/homeassistant/components/sensor/darksky.py
+++ b/homeassistant/components/sensor/darksky.py
@@ -23,11 +23,12 @@ REQUIREMENTS = ['python-forecastio==1.4.0']
 
 _LOGGER = logging.getLogger(__name__)
 
-CONF_ATTRIBUTION = "Powered by Dark Sky"
-CONF_UNITS = 'units'
-CONF_UPDATE_INTERVAL = 'update_interval'
+ATTRIBUTION = "Powered by Dark Sky"
+
 CONF_FORECAST = 'forecast'
 CONF_LANGUAGE = 'language'
+CONF_UNITS = 'units'
+CONF_UPDATE_INTERVAL = 'update_interval'
 
 DEFAULT_LANGUAGE = 'en'
 
@@ -130,6 +131,10 @@ SENSOR_TYPES = {
                  ['currently', 'hourly', 'daily']],
     'moon_phase': ['Moon Phase', None, None, None, None, None,
                    'mdi:weather-night', ['daily']],
+    'sunrise_time': ['Sunrise', None, None, None, None, None,
+                     'mdi:white-balance-sunny', ['daily']],
+    'sunset_time': ['Sunset', None, None, None, None, None,
+                    'mdi:weather-night', ['daily']],
 }
 
 CONDITION_PICTURES = {
@@ -296,7 +301,7 @@ class DarkSkySensor(Entity):
     def device_state_attributes(self):
         """Return the state attributes."""
         return {
-            ATTR_ATTRIBUTION: CONF_ATTRIBUTION,
+            ATTR_ATTRIBUTION: ATTRIBUTION,
         }
 
     def update(self):
diff --git a/homeassistant/components/sensor/dublin_bus_transport.py b/homeassistant/components/sensor/dublin_bus_transport.py
index 0fccf7da5a8..d47c471e90d 100644
--- a/homeassistant/components/sensor/dublin_bus_transport.py
+++ b/homeassistant/components/sensor/dublin_bus_transport.py
@@ -92,7 +92,7 @@ class DublinPublicTransportSensor(Entity):
         """Return the state attributes."""
         if self._times is not None:
             next_up = "None"
-            if self._times:
+            if len(self._times) >= 1:
                 next_up = self._times[1][ATTR_ROUTE] + " in "
                 next_up += self._times[1][ATTR_DUE_IN]
 
diff --git a/homeassistant/components/sensor/eliqonline.py b/homeassistant/components/sensor/eliqonline.py
index a2b1a4071c1..8e750a8d5e1 100644
--- a/homeassistant/components/sensor/eliqonline.py
+++ b/homeassistant/components/sensor/eliqonline.py
@@ -10,11 +10,12 @@ import logging
 import voluptuous as vol
 
 from homeassistant.components.sensor import PLATFORM_SCHEMA
-from homeassistant.const import (CONF_ACCESS_TOKEN, CONF_NAME, STATE_UNKNOWN)
+from homeassistant.const import (CONF_ACCESS_TOKEN, CONF_NAME)
 from homeassistant.helpers.entity import Entity
 import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-REQUIREMENTS = ['eliqonline==1.0.14']
+REQUIREMENTS = ['eliqonline==1.2.2']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -35,24 +36,27 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 })
 
 
-def setup_platform(hass, config, add_entities, discovery_info=None):
+async def async_setup_platform(hass, config, async_add_entities,
+                               discovery_info=None):
     """Set up the ELIQ Online sensor."""
     import eliqonline
 
     access_token = config.get(CONF_ACCESS_TOKEN)
     name = config.get(CONF_NAME, DEFAULT_NAME)
     channel_id = config.get(CONF_CHANNEL_ID)
+    session = async_get_clientsession(hass)
 
-    api = eliqonline.API(access_token)
+    api = eliqonline.API(session=session,
+                         access_token=access_token)
 
     try:
         _LOGGER.debug("Probing for access to ELIQ Online API")
-        api.get_data_now(channelid=channel_id)
+        await api.get_data_now(channelid=channel_id)
     except OSError as error:
         _LOGGER.error("Could not access the ELIQ Online API: %s", error)
         return False
 
-    add_entities([EliqSensor(api, channel_id, name)], True)
+    async_add_entities([EliqSensor(api, channel_id, name)], True)
 
 
 class EliqSensor(Entity):
@@ -61,7 +65,7 @@ class EliqSensor(Entity):
     def __init__(self, api, channel_id, name):
         """Initialize the sensor."""
         self._name = name
-        self._state = STATE_UNKNOWN
+        self._state = None
         self._api = api
         self._channel_id = channel_id
 
@@ -85,12 +89,14 @@ class EliqSensor(Entity):
         """Return the state of the device."""
         return self._state
 
-    def update(self):
+    async def async_update(self):
         """Get the latest data."""
         try:
-            response = self._api.get_data_now(channelid=self._channel_id)
-            self._state = int(response.power)
+            response = await self._api.get_data_now(channelid=self._channel_id)
+            self._state = int(response["power"])
             _LOGGER.debug("Updated power from server %d W", self._state)
+        except KeyError:
+            _LOGGER.warning("Invalid response from ELIQ Online API")
         except OSError as error:
             _LOGGER.warning("Could not connect to the ELIQ Online API: %s",
                             error)
diff --git a/homeassistant/components/sensor/entur_public_transport.py b/homeassistant/components/sensor/entur_public_transport.py
index 01fb22f675c..64884764523 100644
--- a/homeassistant/components/sensor/entur_public_transport.py
+++ b/homeassistant/components/sensor/entur_public_transport.py
@@ -18,7 +18,7 @@ from homeassistant.helpers.entity import Entity
 from homeassistant.util import Throttle
 import homeassistant.util.dt as dt_util
 
-REQUIREMENTS = ['enturclient==0.1.0']
+REQUIREMENTS = ['enturclient==0.1.3']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -29,6 +29,7 @@ API_CLIENT_NAME = 'homeassistant-homeassistant'
 CONF_ATTRIBUTION = "Data provided by entur.org under NLOD."
 CONF_STOP_IDS = 'stop_ids'
 CONF_EXPAND_PLATFORMS = 'expand_platforms'
+CONF_WHITELIST_LINES = 'line_whitelist'
 
 DEFAULT_NAME = 'Entur'
 DEFAULT_ICON_KEY = 'bus'
@@ -36,7 +37,9 @@ DEFAULT_ICON_KEY = 'bus'
 ICONS = {
     'air': 'mdi:airplane',
     'bus': 'mdi:bus',
+    'metro': 'mdi:subway',
     'rail': 'mdi:train',
+    'tram': 'mdi:tram',
     'water': 'mdi:ferry',
 }
 
@@ -47,6 +50,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_EXPAND_PLATFORMS, default=True): cv.boolean,
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
     vol.Optional(CONF_SHOW_ON_MAP, default=False): cv.boolean,
+    vol.Optional(CONF_WHITELIST_LINES, default=[]): cv.ensure_list,
 })
 
 
@@ -70,6 +74,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     from enturclient.consts import CONF_NAME as API_NAME
 
     expand = config.get(CONF_EXPAND_PLATFORMS)
+    line_whitelist = config.get(CONF_WHITELIST_LINES)
     name = config.get(CONF_NAME)
     show_on_map = config.get(CONF_SHOW_ON_MAP)
     stop_ids = config.get(CONF_STOP_IDS)
@@ -77,7 +82,11 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     stops = [s for s in stop_ids if "StopPlace" in s]
     quays = [s for s in stop_ids if "Quay" in s]
 
-    data = EnturPublicTransportData(API_CLIENT_NAME, stops, quays, expand)
+    data = EnturPublicTransportData(API_CLIENT_NAME,
+                                    stops,
+                                    quays,
+                                    expand,
+                                    line_whitelist)
     data.update()
 
     proxy = EnturProxy(data)
@@ -128,7 +137,6 @@ class EnturPublicTransportSensor(Entity):
         self._stop = stop
         self._show_on_map = show_on_map
         self._name = name
-        self._data = None
         self._state = None
         self._icon = ICONS[DEFAULT_ICON_KEY]
         self._attributes = {
@@ -169,20 +177,18 @@ class EnturPublicTransportSensor(Entity):
 
         self.api.update()
 
-        self._data = self.api.get_stop_info(self._stop)
-        if self._data is not None:
-            attrs = self._data[ATTR]
+        data = self.api.get_stop_info(self._stop)
+        if data is not None and ATTR in data:
+            attrs = data[ATTR]
             self._attributes.update(attrs)
 
             if ATTR_NEXT_UP_AT in attrs:
                 self._attributes[ATTR_NEXT_UP_IN] = \
                     due_in_minutes(attrs[ATTR_NEXT_UP_AT])
 
-            if CONF_LOCATION in self._data and self._show_on_map:
-                self._attributes[CONF_LATITUDE] = \
-                    self._data[CONF_LOCATION][LAT]
-                self._attributes[CONF_LONGITUDE] = \
-                    self._data[CONF_LOCATION][LONG]
+            if CONF_LOCATION in data and self._show_on_map:
+                self._attributes[CONF_LATITUDE] = data[CONF_LOCATION][LAT]
+                self._attributes[CONF_LONGITUDE] = data[CONF_LOCATION][LONG]
 
             if ATTR_EXPECTED_AT in attrs:
                 self._state = due_in_minutes(attrs[ATTR_EXPECTED_AT])
@@ -190,4 +196,6 @@ class EnturPublicTransportSensor(Entity):
                 self._state = None
 
             self._icon = ICONS.get(
-                self._data[CONF_TRANSPORT_MODE], ICONS[DEFAULT_ICON_KEY])
+                data[CONF_TRANSPORT_MODE], ICONS[DEFAULT_ICON_KEY])
+        else:
+            self._state = None
diff --git a/homeassistant/components/sensor/esphome.py b/homeassistant/components/sensor/esphome.py
new file mode 100644
index 00000000000..f776ea4683b
--- /dev/null
+++ b/homeassistant/components/sensor/esphome.py
@@ -0,0 +1,94 @@
+"""Support for esphome sensors."""
+import logging
+import math
+from typing import Optional, TYPE_CHECKING
+
+from homeassistant.components.esphome import EsphomeEntity, \
+    platform_async_setup_entry
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.helpers.typing import HomeAssistantType
+
+if TYPE_CHECKING:
+    # pylint: disable=unused-import
+    from aioesphomeapi import ( # noqa
+        SensorInfo, SensorState, TextSensorInfo, TextSensorState)
+
+DEPENDENCIES = ['esphome']
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(hass: HomeAssistantType,
+                            entry: ConfigEntry, async_add_entities) -> None:
+    """Set up esphome sensors based on a config entry."""
+    # pylint: disable=redefined-outer-name
+    from aioesphomeapi import (  # noqa
+        SensorInfo, SensorState, TextSensorInfo, TextSensorState)
+
+    await platform_async_setup_entry(
+        hass, entry, async_add_entities,
+        component_key='sensor',
+        info_type=SensorInfo, entity_type=EsphomeSensor,
+        state_type=SensorState
+    )
+    await platform_async_setup_entry(
+        hass, entry, async_add_entities,
+        component_key='text_sensor',
+        info_type=TextSensorInfo, entity_type=EsphomeTextSensor,
+        state_type=TextSensorState
+    )
+
+
+class EsphomeSensor(EsphomeEntity):
+    """A sensor implementation for esphome."""
+
+    @property
+    def _static_info(self) -> 'SensorInfo':
+        return super()._static_info
+
+    @property
+    def _state(self) -> Optional['SensorState']:
+        return super()._state
+
+    @property
+    def icon(self) -> str:
+        """Return the icon."""
+        return self._static_info.icon
+
+    @property
+    def state(self) -> Optional[str]:
+        """Return the state of the entity."""
+        if self._state is None:
+            return None
+        if math.isnan(self._state.state):
+            return None
+        return '{:.{prec}f}'.format(
+            self._state.state, prec=self._static_info.accuracy_decimals)
+
+    @property
+    def unit_of_measurement(self) -> str:
+        """Return the unit the value is expressed in."""
+        return self._static_info.unit_of_measurement
+
+
+class EsphomeTextSensor(EsphomeEntity):
+    """A text sensor implementation for ESPHome."""
+
+    @property
+    def _static_info(self) -> 'TextSensorInfo':
+        return super()._static_info
+
+    @property
+    def _state(self) -> Optional['TextSensorState']:
+        return super()._state
+
+    @property
+    def icon(self) -> str:
+        """Return the icon."""
+        return self._static_info.icon
+
+    @property
+    def state(self) -> Optional[str]:
+        """Return the state of the entity."""
+        if self._state is None:
+            return None
+        return self._state.state
diff --git a/homeassistant/components/sensor/fail2ban.py b/homeassistant/components/sensor/fail2ban.py
index f152a43e241..6080ce9fd10 100644
--- a/homeassistant/components/sensor/fail2ban.py
+++ b/homeassistant/components/sensor/fail2ban.py
@@ -3,6 +3,7 @@ Support for displaying IPs banned by fail2ban.
 
 For more details about this platform, please refer to the documentation at
 https://home-assistant.io/components/sensor.fail2ban/
+
 """
 import os
 import logging
@@ -13,10 +14,9 @@ import re
 import voluptuous as vol
 
 import homeassistant.helpers.config_validation as cv
-import homeassistant.util.dt as dt_util
 from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.const import (
-    CONF_NAME, CONF_SCAN_INTERVAL, CONF_FILE_PATH
+    CONF_NAME, CONF_FILE_PATH
 )
 from homeassistant.helpers.entity import Entity
 
@@ -26,10 +26,10 @@ CONF_JAILS = 'jails'
 
 DEFAULT_NAME = 'fail2ban'
 DEFAULT_LOG = '/var/log/fail2ban.log'
-SCAN_INTERVAL = timedelta(seconds=120)
 
 STATE_CURRENT_BANS = 'current_bans'
 STATE_ALL_BANS = 'total_bans'
+SCAN_INTERVAL = timedelta(seconds=120)
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_JAILS): vol.All(cv.ensure_list, vol.Length(min=1)),
@@ -43,11 +43,10 @@ async def async_setup_platform(hass, config, async_add_entities,
     """Set up the fail2ban sensor."""
     name = config.get(CONF_NAME)
     jails = config.get(CONF_JAILS)
-    scan_interval = config.get(CONF_SCAN_INTERVAL)
     log_file = config.get(CONF_FILE_PATH, DEFAULT_LOG)
 
     device_list = []
-    log_parser = BanLogParser(scan_interval, log_file)
+    log_parser = BanLogParser(log_file)
     for jail in jails:
         device_list.append(BanSensor(name, jail, log_parser))
 
@@ -86,8 +85,7 @@ class BanSensor(Entity):
 
     def update(self):
         """Update the list of banned ips."""
-        if self.log_parser.timer():
-            self.log_parser.read_log(self.jail)
+        self.log_parser.read_log(self.jail)
 
         if self.log_parser.data:
             for entry in self.log_parser.data:
@@ -114,22 +112,12 @@ class BanSensor(Entity):
 class BanLogParser:
     """Class to parse fail2ban logs."""
 
-    def __init__(self, interval, log_file):
+    def __init__(self, log_file):
         """Initialize the parser."""
-        self.interval = interval
         self.log_file = log_file
         self.data = list()
-        self.last_update = dt_util.now()
         self.ip_regex = dict()
 
-    def timer(self):
-        """Check if we are allowed to update."""
-        boundary = dt_util.now() - self.interval
-        if boundary > self.last_update:
-            self.last_update = dt_util.now()
-            return True
-        return False
-
     def read_log(self, jail):
         """Read the fail2ban log and find entries for jail."""
         self.data = list()
diff --git a/homeassistant/components/sensor/filter.py b/homeassistant/components/sensor/filter.py
index e93795c3668..42589d6bed3 100644
--- a/homeassistant/components/sensor/filter.py
+++ b/homeassistant/components/sensor/filter.py
@@ -79,7 +79,7 @@ FILTER_LOWPASS_SCHEMA = FILTER_SCHEMA.extend({
                  default=DEFAULT_FILTER_TIME_CONSTANT): vol.Coerce(int),
 })
 
-FILTER_RANGE_SCHEMA = FILTER_SCHEMA.extend({
+FILTER_RANGE_SCHEMA = vol.Schema({
     vol.Required(CONF_FILTER_NAME): FILTER_NAME_RANGE,
     vol.Optional(CONF_FILTER_LOWER_BOUND): vol.Coerce(float),
     vol.Optional(CONF_FILTER_UPPER_BOUND): vol.Coerce(float),
diff --git a/homeassistant/components/sensor/flunearyou.py b/homeassistant/components/sensor/flunearyou.py
index 2c3598044bd..ee1c378aea3 100644
--- a/homeassistant/components/sensor/flunearyou.py
+++ b/homeassistant/components/sensor/flunearyou.py
@@ -18,13 +18,15 @@ from homeassistant.helpers import aiohttp_client
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import Throttle
 
-REQUIREMENTS = ['pyflunearyou==0.0.2']
+REQUIREMENTS = ['pyflunearyou==1.0.0']
 _LOGGER = logging.getLogger(__name__)
 
 ATTR_CITY = 'city'
 ATTR_REPORTED_DATE = 'reported_date'
 ATTR_REPORTED_LATITUDE = 'reported_latitude'
 ATTR_REPORTED_LONGITUDE = 'reported_longitude'
+ATTR_STATE_REPORTS_LAST_WEEK = 'state_reports_last_week'
+ATTR_STATE_REPORTS_THIS_WEEK = 'state_reports_this_week'
 ATTR_ZIP_CODE = 'zip_code'
 
 DEFAULT_ATTRIBUTION = 'Data provided by Flu Near You'
@@ -41,10 +43,16 @@ TYPE_USER_CHICK = 'chick'
 TYPE_USER_DENGUE = 'dengue'
 TYPE_USER_FLU = 'flu'
 TYPE_USER_LEPTO = 'lepto'
-TYPE_USER_NO_NONE = 'none'
+TYPE_USER_NO_SYMPTOMS = 'none'
 TYPE_USER_SYMPTOMS = 'symptoms'
 TYPE_USER_TOTAL = 'total'
 
+EXTENDED_TYPE_MAPPING = {
+    TYPE_USER_FLU: 'ili',
+    TYPE_USER_NO_SYMPTOMS: 'no_symptoms',
+    TYPE_USER_TOTAL: 'total_surveys',
+}
+
 SENSORS = {
     CATEGORY_CDC_REPORT: [
         (TYPE_CDC_LEVEL, 'CDC Level', 'mdi:biohazard', None),
@@ -55,7 +63,7 @@ SENSORS = {
         (TYPE_USER_DENGUE, 'Dengue Fever Symptoms', 'mdi:alert', 'reports'),
         (TYPE_USER_FLU, 'Flu Symptoms', 'mdi:alert', 'reports'),
         (TYPE_USER_LEPTO, 'Leptospirosis Symptoms', 'mdi:alert', 'reports'),
-        (TYPE_USER_NO_NONE, 'No Symptoms', 'mdi:alert', 'reports'),
+        (TYPE_USER_NO_SYMPTOMS, 'No Symptoms', 'mdi:alert', 'reports'),
         (TYPE_USER_SYMPTOMS, 'Flu-like Symptoms', 'mdi:alert', 'reports'),
         (TYPE_USER_TOTAL, 'Total Symptoms', 'mdi:alert', 'reports'),
     ]
@@ -72,26 +80,20 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 async def async_setup_platform(
         hass, config, async_add_entities, discovery_info=None):
     """Configure the platform and add the sensors."""
-    from pyflunearyou import create_client
-    from pyflunearyou.errors import FluNearYouError
+    from pyflunearyou import Client
 
     websession = aiohttp_client.async_get_clientsession(hass)
 
     latitude = config.get(CONF_LATITUDE, hass.config.latitude)
     longitude = config.get(CONF_LONGITUDE, hass.config.longitude)
-    identifier = '{0},{1}'.format(latitude, longitude)
 
-    try:
-        client = await create_client(latitude, longitude, websession)
-    except FluNearYouError as err:
-        _LOGGER.error('There was an error while setting up: %s', err)
-        return
-
-    fny = FluNearYouData(client, config[CONF_MONITORED_CONDITIONS])
+    fny = FluNearYouData(
+        Client(websession), latitude, longitude,
+        config[CONF_MONITORED_CONDITIONS])
     await fny.async_update()
 
     sensors = [
-        FluNearYouSensor(fny, kind, name, identifier, category, icon, unit)
+        FluNearYouSensor(fny, kind, name, category, icon, unit)
         for category in config[CONF_MONITORED_CONDITIONS]
         for kind, name, icon, unit in SENSORS[category]
     ]
@@ -102,12 +104,11 @@ async def async_setup_platform(
 class FluNearYouSensor(Entity):
     """Define a base Flu Near You sensor."""
 
-    def __init__(self, fny, kind, name, identifier, category, icon, unit):
+    def __init__(self, fny, kind, name, category, icon, unit):
         """Initialize the sensor."""
         self._attrs = {ATTR_ATTRIBUTION: DEFAULT_ATTRIBUTION}
         self._category = category
         self._icon = icon
-        self._identifier = identifier
         self._kind = kind
         self._name = name
         self._state = None
@@ -142,7 +143,8 @@ class FluNearYouSensor(Entity):
     @property
     def unique_id(self):
         """Return a unique, HASS-friendly identifier for this entity."""
-        return '{0}_{1}'.format(self._identifier, self._kind)
+        return '{0},{1}_{2}'.format(
+            self.fny.latitude, self.fny.longitude, self._kind)
 
     @property
     def unit_of_measurement(self):
@@ -164,50 +166,59 @@ class FluNearYouSensor(Entity):
             self._state = cdc_data[self._kind]
         elif self._category == CATEGORY_USER_REPORT and user_data:
             self._attrs.update({
-                ATTR_CITY: user_data['city'].split('(')[0],
-                ATTR_REPORTED_LATITUDE: user_data['latitude'],
-                ATTR_REPORTED_LONGITUDE: user_data['longitude'],
-                ATTR_ZIP_CODE: user_data['zip'],
+                ATTR_CITY: user_data['local']['city'].split('(')[0],
+                ATTR_REPORTED_LATITUDE: user_data['local']['latitude'],
+                ATTR_REPORTED_LONGITUDE: user_data['local']['longitude'],
+                ATTR_STATE: user_data['state']['name'],
+                ATTR_ZIP_CODE: user_data['local']['zip'],
             })
 
+            if self._kind in user_data['state']['data']:
+                states_key = self._kind
+            elif self._kind in EXTENDED_TYPE_MAPPING:
+                states_key = EXTENDED_TYPE_MAPPING[self._kind]
+
+            self._attrs[ATTR_STATE_REPORTS_THIS_WEEK] = user_data['state'][
+                'data'][states_key]
+            self._attrs[ATTR_STATE_REPORTS_LAST_WEEK] = user_data['state'][
+                'last_week_data'][states_key]
+
             if self._kind == TYPE_USER_TOTAL:
                 self._state = sum(
-                    v for k, v in user_data.items() if k in (
+                    v for k, v in user_data['local'].items() if k in (
                         TYPE_USER_CHICK, TYPE_USER_DENGUE, TYPE_USER_FLU,
                         TYPE_USER_LEPTO, TYPE_USER_SYMPTOMS))
             else:
-                self._state = user_data[self._kind]
+                self._state = user_data['local'][self._kind]
 
 
 class FluNearYouData:
     """Define a data object to retrieve info from Flu Near You."""
 
-    def __init__(self, client, sensor_types):
+    def __init__(self, client, latitude, longitude, sensor_types):
         """Initialize."""
         self._client = client
         self._sensor_types = sensor_types
         self.data = {}
-
-    async def _get_data(self, category, method):
-        """Get data for a specific category."""
-        from pyflunearyou.errors import FluNearYouError
-
-        try:
-            self.data[category] = await method()
-        except FluNearYouError as err:
-            _LOGGER.error(
-                'There was an error with "%s" data: %s', category, err)
-            self.data[category] = {}
+        self.latitude = latitude
+        self.longitude = longitude
 
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     async def async_update(self):
         """Update Flu Near You data."""
-        if CATEGORY_CDC_REPORT in self._sensor_types:
-            await self._get_data(
-                CATEGORY_CDC_REPORT, self._client.cdc_reports.status)
+        from pyflunearyou.errors import FluNearYouError
 
-        if CATEGORY_USER_REPORT in self._sensor_types:
-            await self._get_data(
-                CATEGORY_USER_REPORT, self._client.user_reports.status)
+        for key, method in [(CATEGORY_CDC_REPORT,
+                             self._client.cdc_reports.status_by_coordinates),
+                            (CATEGORY_USER_REPORT,
+                             self._client.user_reports.status_by_coordinates)]:
+            if key in self._sensor_types:
+                try:
+                    self.data[key] = await method(
+                        self.latitude, self.longitude)
+                except FluNearYouError as err:
+                    _LOGGER.error(
+                        'There was an error with "%s" data: %s', key, err)
+                    self.data[key] = {}
 
         _LOGGER.debug('New data stored: %s', self.data)
diff --git a/homeassistant/components/sensor/freebox.py b/homeassistant/components/sensor/freebox.py
new file mode 100644
index 00000000000..cc737d2d398
--- /dev/null
+++ b/homeassistant/components/sensor/freebox.py
@@ -0,0 +1,86 @@
+"""
+Support for Freebox devices (Freebox v6 and Freebox mini 4K).
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/sensor.freebox/
+"""
+import logging
+
+from homeassistant.components.freebox import DATA_FREEBOX
+from homeassistant.helpers.entity import Entity
+
+DEPENDENCIES = ['freebox']
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_platform(
+        hass, config, add_entities, discovery_info=None):
+    """Set up the sensors."""
+    fbx = hass.data[DATA_FREEBOX]
+    add_entities([
+        FbxRXSensor(fbx),
+        FbxTXSensor(fbx)
+    ])
+
+
+class FbxSensor(Entity):
+    """Representation of a freebox sensor."""
+
+    _name = 'generic'
+
+    def __init__(self, fbx):
+        """Initialize the sensor."""
+        self._fbx = fbx
+        self._state = None
+        self._datas = None
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    async def async_update(self):
+        """Fetch status from freebox."""
+        self._datas = await self._fbx.connection.get_status()
+
+
+class FbxRXSensor(FbxSensor):
+    """Update the Freebox RxSensor."""
+
+    _name = 'Freebox download speed'
+    _unit = 'KB/s'
+
+    @property
+    def unit_of_measurement(self):
+        """Define the unit."""
+        return self._unit
+
+    async def async_update(self):
+        """Get the value from fetched datas."""
+        await super().async_update()
+        if self._datas is not None:
+            self._state = round(self._datas['rate_down'] / 1000, 2)
+
+
+class FbxTXSensor(FbxSensor):
+    """Update the Freebox TxSensor."""
+
+    _name = 'Freebox upload speed'
+    _unit = 'KB/s'
+
+    @property
+    def unit_of_measurement(self):
+        """Define the unit."""
+        return self._unit
+
+    async def async_update(self):
+        """Get the value from fetched datas."""
+        await super().async_update()
+        if self._datas is not None:
+            self._state = round(self._datas['rate_up'] / 1000, 2)
diff --git a/homeassistant/components/sensor/geizhals.py b/homeassistant/components/sensor/geizhals.py
index 7d215fb6baf..66cab473f49 100644
--- a/homeassistant/components/sensor/geizhals.py
+++ b/homeassistant/components/sensor/geizhals.py
@@ -15,7 +15,7 @@ from homeassistant.util import Throttle
 from homeassistant.helpers.entity import Entity
 from homeassistant.const import CONF_NAME
 
-REQUIREMENTS = ['geizhals==0.0.7']
+REQUIREMENTS = ['geizhals==0.0.9']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -80,6 +80,9 @@ class Geizwatch(Entity):
     @property
     def state(self):
         """Return the best price of the selected product."""
+        if not self._device.prices:
+            return None
+
         return self._device.prices[0]
 
     @property
diff --git a/homeassistant/components/sensor/geo_rss_events.py b/homeassistant/components/sensor/geo_rss_events.py
index 7157416d4b5..e5e2f3d46f1 100644
--- a/homeassistant/components/sensor/geo_rss_events.py
+++ b/homeassistant/components/sensor/geo_rss_events.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
     CONF_LATITUDE, CONF_LONGITUDE, CONF_RADIUS, CONF_URL)
 from homeassistant.helpers.entity import Entity
 
-REQUIREMENTS = ['georss_client==0.4']
+REQUIREMENTS = ['georss_client==0.5']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/sensor/glances.py b/homeassistant/components/sensor/glances.py
index 1dfb7a206c6..5ac0816a0c1 100644
--- a/homeassistant/components/sensor/glances.py
+++ b/homeassistant/components/sensor/glances.py
@@ -180,7 +180,8 @@ class GlancesSensor(Entity):
             elif self.type == 'cpu_temp':
                 for sensor in value['sensors']:
                     if sensor['label'] in ['CPU', "Package id 0",
-                                           "Physical id 0"]:
+                                           "Physical id 0", "cpu-thermal 1",
+                                           "exynos-therm 1", "soc_thermal 1"]:
                         self._state = sensor['value']
             elif self.type == 'docker_active':
                 count = 0
diff --git a/homeassistant/components/sensor/gtfs.py b/homeassistant/components/sensor/gtfs.py
index 633a50f15c1..3ccc60457b6 100644
--- a/homeassistant/components/sensor/gtfs.py
+++ b/homeassistant/components/sensor/gtfs.py
@@ -16,7 +16,7 @@ from homeassistant.const import CONF_NAME
 from homeassistant.helpers.entity import Entity
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['pygtfs-homeassistant==0.1.3.dev0']
+REQUIREMENTS = ['pygtfs==0.1.5']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -169,9 +169,9 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 
     import pygtfs
 
-    split_file_name = os.path.splitext(data)
+    (gtfs_root, _) = os.path.splitext(data)
 
-    sqlite_file = "{}.sqlite".format(split_file_name[0])
+    sqlite_file = "{}.sqlite?check_same_thread=False".format(gtfs_root)
     joined_path = os.path.join(gtfs_dir, sqlite_file)
     gtfs = pygtfs.Schedule(joined_path)
 
diff --git a/homeassistant/components/sensor/gtt.py b/homeassistant/components/sensor/gtt.py
new file mode 100644
index 00000000000..33175d0c071
--- /dev/null
+++ b/homeassistant/components/sensor/gtt.py
@@ -0,0 +1,115 @@
+"""
+Sensor to get GTT's timetable for a stop.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/sensor.gtt/
+"""
+import logging
+from datetime import timedelta, datetime
+
+import voluptuous as vol
+
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.const import DEVICE_CLASS_TIMESTAMP
+from homeassistant.helpers.entity import Entity
+import homeassistant.helpers.config_validation as cv
+import homeassistant.util.dt as dt_util
+
+REQUIREMENTS = ['pygtt==1.1.2']
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_STOP = 'stop'
+CONF_BUS_NAME = 'bus_name'
+
+ICON = 'mdi:train'
+
+SCAN_INTERVAL = timedelta(minutes=2)
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_STOP): cv.string,
+    vol.Optional(CONF_BUS_NAME): cv.string
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the Gtt platform."""
+    stop = config[CONF_STOP]
+    bus_name = config.get(CONF_BUS_NAME)
+
+    add_entities([GttSensor(stop, bus_name)], True)
+
+
+class GttSensor(Entity):
+    """Representation of a Gtt Sensor."""
+
+    def __init__(self, stop, bus_name):
+        """Initialize the Gtt sensor."""
+        self.data = GttData(stop, bus_name)
+        self._state = None
+        self._name = 'Stop {}'.format(stop)
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def icon(self):
+        """Return the icon of the sensor."""
+        return ICON
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def device_class(self):
+        """Return the device class."""
+        return DEVICE_CLASS_TIMESTAMP
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes of the sensor."""
+        attr = {
+            'bus_name': self.data.state_bus['bus_name']
+        }
+        return attr
+
+    def update(self):
+        """Update device state."""
+        self.data.get_data()
+        next_time = dt_util.parse_time(self.data.state_bus['time'][0]['run'])
+        self._state = next_time.isoformat()
+
+
+class GttData:
+    """Inteface to PyGTT."""
+
+    def __init__(self, stop, bus_name):
+        """Initialize the GttData class."""
+        from pygtt import PyGTT
+        self._pygtt = PyGTT()
+        self._stop = stop
+        self._bus_name = bus_name
+        self.bus_list = {}
+        self.state_bus = {}
+
+    def get_data(self):
+        """Get the data from the api."""
+        self.bus_list = self._pygtt.get_by_stop(self._stop)
+        self.bus_list.sort(key=lambda b:
+                           datetime.strptime(b['time'][0]['run'], "%H:%M"))
+
+        if self._bus_name is not None:
+            self.state_bus = self.get_bus_by_name()
+            return
+
+        self.state_bus = self.bus_list[0]
+
+    def get_bus_by_name(self):
+        """Get the bus by name."""
+        for bus in self.bus_list:
+            if bus['bus_name'] == self._bus_name:
+                return bus
diff --git a/homeassistant/components/sensor/homematic.py b/homeassistant/components/sensor/homematic.py
index 26fa76d94a9..84cf19652a1 100644
--- a/homeassistant/components/sensor/homematic.py
+++ b/homeassistant/components/sensor/homematic.py
@@ -48,6 +48,7 @@ HM_UNIT_HA_CAST = {
     'GAS_POWER': 'm3',
     'GAS_ENERGY_COUNTER': 'm3',
     'LUX': 'lx',
+    'ILLUMINATION': 'lx',
     'CURRENT_ILLUMINATION': 'lx',
     'AVERAGE_ILLUMINATION': 'lx',
     'LOWEST_ILLUMINATION': 'lx',
diff --git a/homeassistant/components/sensor/homematicip_cloud.py b/homeassistant/components/sensor/homematicip_cloud.py
index 73fef98fb76..77feda20be1 100644
--- a/homeassistant/components/sensor/homematicip_cloud.py
+++ b/homeassistant/components/sensor/homematicip_cloud.py
@@ -35,7 +35,8 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     from homematicip.aio.device import (
         AsyncHeatingThermostat, AsyncTemperatureHumiditySensorWithoutDisplay,
         AsyncTemperatureHumiditySensorDisplay, AsyncMotionDetectorIndoor,
-        AsyncTemperatureHumiditySensorOutdoor)
+        AsyncTemperatureHumiditySensorOutdoor,
+        AsyncMotionDetectorPushButton)
 
     home = hass.data[HMIPC_DOMAIN][config_entry.data[HMIPC_HAPID]].home
     devices = [HomematicipAccesspointStatus(home)]
@@ -47,7 +48,8 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
                                AsyncTemperatureHumiditySensorOutdoor)):
             devices.append(HomematicipTemperatureSensor(home, device))
             devices.append(HomematicipHumiditySensor(home, device))
-        if isinstance(device, AsyncMotionDetectorIndoor):
+        if isinstance(device, (AsyncMotionDetectorIndoor,
+                               AsyncMotionDetectorPushButton)):
             devices.append(HomematicipIlluminanceSensor(home, device))
 
     if devices:
diff --git a/homeassistant/components/sensor/huawei_lte.py b/homeassistant/components/sensor/huawei_lte.py
index 5ff5f9b38ae..ae376045544 100644
--- a/homeassistant/components/sensor/huawei_lte.py
+++ b/homeassistant/components/sensor/huawei_lte.py
@@ -117,6 +117,7 @@ def setup_platform(
     data = hass.data[DATA_KEY].get_data(config)
     sensors = []
     for path in config.get(CONF_MONITORED_CONDITIONS):
+        data.subscribe(path)
         sensors.append(HuaweiLteSensor(
             data, path, SENSOR_META.get(path, {})))
     add_entities(sensors, True)
diff --git a/homeassistant/components/sensor/islamic_prayer_times.py b/homeassistant/components/sensor/islamic_prayer_times.py
new file mode 100644
index 00000000000..a1ea5212461
--- /dev/null
+++ b/homeassistant/components/sensor/islamic_prayer_times.py
@@ -0,0 +1,221 @@
+"""
+Platform to retrieve Islamic prayer times information for Home Assistant.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/sensor.islamic_prayer_times/
+"""
+import logging
+from datetime import datetime, timedelta
+import voluptuous as vol
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity import Entity
+import homeassistant.util.dt as dt_util
+from homeassistant.helpers.event import async_track_point_in_time
+from homeassistant.const import DEVICE_CLASS_TIMESTAMP
+
+REQUIREMENTS = ['prayer_times_calculator==0.0.3']
+
+_LOGGER = logging.getLogger(__name__)
+
+PRAYER_TIMES_ICON = 'mdi:calendar-clock'
+
+SENSOR_TYPES = ['fajr', 'sunrise', 'dhuhr', 'asr', 'maghrib', 'isha',
+                'midnight']
+
+CONF_CALC_METHOD = 'calculation_method'
+CONF_SENSORS = 'sensors'
+
+CALC_METHODS = ['karachi', 'isna', 'mwl', 'makkah']
+DEFAULT_CALC_METHOD = 'isna'
+DEFAULT_SENSORS = ['fajr', 'dhuhr', 'asr', 'maghrib', 'isha']
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_CALC_METHOD, default=DEFAULT_CALC_METHOD): vol.In(
+        CALC_METHODS),
+    vol.Optional(CONF_SENSORS, default=DEFAULT_SENSORS):
+        vol.All(cv.ensure_list, vol.Length(min=1), [vol.In(SENSOR_TYPES)]),
+})
+
+
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
+    """Set up the Islamic prayer times sensor platform."""
+    latitude = hass.config.latitude
+    longitude = hass.config.longitude
+    calc_method = config.get(CONF_CALC_METHOD)
+
+    if None in (latitude, longitude):
+        _LOGGER.error("Latitude or longitude not set in Home Assistant config")
+        return
+
+    prayer_times_data = IslamicPrayerTimesData(latitude,
+                                               longitude,
+                                               calc_method)
+
+    prayer_times = prayer_times_data.get_new_prayer_times()
+
+    sensors = []
+    for sensor_type in config[CONF_SENSORS]:
+        sensors.append(IslamicPrayerTimeSensor(sensor_type, prayer_times_data))
+
+    async_add_entities(sensors, True)
+
+    # schedule the next update for the sensors
+    await schedule_future_update(hass, sensors, prayer_times['Midnight'],
+                                 prayer_times_data)
+
+
+async def schedule_future_update(hass, sensors, midnight_time,
+                                 prayer_times_data):
+    """Schedule future update for sensors.
+
+    Midnight is a calculated time.  The specifics of the calculation
+    depends on the method of the prayer time calculation.  This calculated
+    midnight is the time at which the time to pray the Isha prayers have
+    expired.
+
+    Calculated Midnight: The Islamic midnight.
+    Traditional Midnight: 12:00AM
+
+    Update logic for prayer times:
+
+    If the Calculated Midnight is before the traditional midnight then wait
+    until the traditional midnight to run the update.  This way the day
+    will have changed over and we don't need to do any fancy calculations.
+
+    If the Calculated Midnight is after the traditional midnight, then wait
+    until after the calculated Midnight.  We don't want to update the prayer
+    times too early or else the timings might be incorrect.
+
+    Example:
+    calculated midnight = 11:23PM (before traditional midnight)
+    Update time: 12:00AM
+
+    calculated midnight = 1:35AM (after traditional midnight)
+    update time: 1:36AM.
+    """
+    _LOGGER.debug("Scheduling next update for Islamic prayer times")
+
+    now = dt_util.as_local(dt_util.now())
+    today = now.date()
+
+    midnight_dt_str = '{}::{}'.format(str(today), midnight_time)
+    midnight_dt = datetime.strptime(midnight_dt_str, '%Y-%m-%d::%H:%M')
+
+    if now > dt_util.as_local(midnight_dt):
+        _LOGGER.debug("Midnight is after day the changes so schedule update "
+                      "for after Midnight the next day")
+
+        next_update_at = midnight_dt + timedelta(days=1, minutes=1)
+    else:
+        _LOGGER.debug(
+            "Midnight is before the day changes so schedule update for the "
+            "next start of day")
+
+        tomorrow = now + timedelta(days=1)
+        next_update_at = dt_util.start_of_local_day(tomorrow)
+
+    _LOGGER.debug("Next update scheduled for: %s", str(next_update_at))
+
+    async_track_point_in_time(hass,
+                              update_sensors(hass, sensors, prayer_times_data),
+                              next_update_at)
+
+
+async def update_sensors(hass, sensors, prayer_times_data):
+    """Update sensors with new prayer times."""
+    # Update prayer times
+    prayer_times = prayer_times_data.get_new_prayer_times()
+
+    _LOGGER.debug("New prayer times retrieved.  Updating sensors.")
+
+    # Update all prayer times sensors
+    for sensor in sensors:
+        sensor.async_schedule_update_ha_state(True)
+
+    # Schedule next update
+    await schedule_future_update(hass, sensors, prayer_times['Midnight'],
+                                 prayer_times_data)
+
+
+class IslamicPrayerTimesData:
+    """Data object for Islamic prayer times."""
+
+    def __init__(self, latitude, longitude, calc_method):
+        """Create object to hold data."""
+        self.latitude = latitude
+        self.longitude = longitude
+        self.calc_method = calc_method
+        self.prayer_times_info = None
+
+    def get_new_prayer_times(self):
+        """Fetch prayer times for today."""
+        from prayer_times_calculator import PrayerTimesCalculator
+
+        today = datetime.today().strftime('%Y-%m-%d')
+
+        calc = PrayerTimesCalculator(latitude=self.latitude,
+                                     longitude=self.longitude,
+                                     calculation_method=self.calc_method,
+                                     date=str(today))
+
+        self.prayer_times_info = calc.fetch_prayer_times()
+        return self.prayer_times_info
+
+
+class IslamicPrayerTimeSensor(Entity):
+    """Representation of an Islamic prayer time sensor."""
+
+    ENTITY_ID_FORMAT = 'sensor.islamic_prayer_time_{}'
+
+    def __init__(self, sensor_type, prayer_times_data):
+        """Initialize the Islamic prayer time sensor."""
+        self.sensor_type = sensor_type
+        self.entity_id = self.ENTITY_ID_FORMAT.format(self.sensor_type)
+        self.prayer_times_data = prayer_times_data
+        self._name = self.sensor_type.capitalize()
+        self._device_class = DEVICE_CLASS_TIMESTAMP
+        prayer_time = self.prayer_times_data.prayer_times_info[
+            self._name]
+        pt_dt = self.get_prayer_time_as_dt(prayer_time)
+        self._state = pt_dt.isoformat()
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def icon(self):
+        """Icon to display in the front end."""
+        return PRAYER_TIMES_ICON
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    @property
+    def should_poll(self):
+        """Disable polling."""
+        return False
+
+    @property
+    def device_class(self):
+        """Return the device class."""
+        return self._device_class
+
+    @staticmethod
+    def get_prayer_time_as_dt(prayer_time):
+        """Create a datetime object for the respective prayer time."""
+        today = datetime.today().strftime('%Y-%m-%d')
+        date_time_str = '{} {}'.format(str(today), prayer_time)
+        pt_dt = dt_util.parse_datetime(date_time_str)
+        return pt_dt
+
+    async def async_update(self):
+        """Update the sensor."""
+        prayer_time = self.prayer_times_data.prayer_times_info[self.name]
+        pt_dt = self.get_prayer_time_as_dt(prayer_time)
+        self._state = pt_dt.isoformat()
diff --git a/homeassistant/components/sensor/launch_library.py b/homeassistant/components/sensor/launch_library.py
index 0d109006818..aaed2f9663f 100644
--- a/homeassistant/components/sensor/launch_library.py
+++ b/homeassistant/components/sensor/launch_library.py
@@ -15,7 +15,7 @@ from homeassistant.const import ATTR_ATTRIBUTION, CONF_NAME
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-REQUIREMENTS = ['pylaunches==0.1.2']
+REQUIREMENTS = ['pylaunches==0.2.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/sensor/london_underground.py b/homeassistant/components/sensor/london_underground.py
index a0617469cba..d44806cf481 100644
--- a/homeassistant/components/sensor/london_underground.py
+++ b/homeassistant/components/sensor/london_underground.py
@@ -8,12 +8,12 @@ import logging
 from datetime import timedelta
 
 import voluptuous as vol
-import requests
 
 import homeassistant.helpers.config_validation as cv
 from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.helpers.entity import Entity
-from homeassistant.util import Throttle
+
+REQUIREMENTS = ['london-tube-status==0.2']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -35,7 +35,6 @@ TUBE_LINES = [
     'TfL Rail',
     'Victoria',
     'Waterloo & City']
-URL = 'https://api.tfl.gov.uk/line/mode/tube,overground,dlr,tflrail/status'
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_LINE):
@@ -45,6 +44,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the Tube sensor."""
+    from london_tube_status import TubeData
     data = TubeData()
     data.update()
     sensors = []
@@ -93,43 +93,3 @@ class LondonTubeSensor(Entity):
         self._data.update()
         self._state = self._data.data[self.name]['State']
         self._description = self._data.data[self.name]['Description']
-
-
-class TubeData:
-    """Get the latest tube data from TFL."""
-
-    def __init__(self):
-        """Initialize the TubeData object."""
-        self.data = None
-
-    # Update only once in scan interval.
-    @Throttle(SCAN_INTERVAL)
-    def update(self):
-        """Get the latest data from TFL."""
-        response = requests.get(URL)
-        if response.status_code != 200:
-            _LOGGER.warning("Invalid response from API")
-        else:
-            self.data = parse_api_response(response.json())
-
-
-def parse_api_response(response):
-    """Take in the TFL API json response."""
-    lines = [line['name'] for line in response]
-    data_dict = dict.fromkeys(lines)
-
-    for line in response:
-        statuses = [status['statusSeverityDescription']
-                    for status in line['lineStatuses']]
-        state = ' + '.join(sorted(set(statuses)))
-
-        if state == 'Good Service':
-            reason = 'Nothing to report'
-        else:
-            reason = ' *** '.join(
-                [status['reason'] for status in line['lineStatuses']])
-
-        attr = {'State': state, 'Description': reason}
-        data_dict[line['name']] = attr
-
-    return data_dict
diff --git a/homeassistant/components/sensor/luftdaten.py b/homeassistant/components/sensor/luftdaten.py
index 4752286b9b2..d0792883457 100644
--- a/homeassistant/components/sensor/luftdaten.py
+++ b/homeassistant/components/sensor/luftdaten.py
@@ -37,8 +37,7 @@ async def async_setup_entry(hass, entry, async_add_entities):
         sensors.append(
             LuftdatenSensor(
                 luftdaten, sensor_type, name, icon, unit,
-                entry.data[CONF_SHOW_ON_MAP])
-        )
+                entry.data[CONF_SHOW_ON_MAP]))
 
     async_add_entities(sensors, True)
 
@@ -67,7 +66,8 @@ class LuftdatenSensor(Entity):
     @property
     def state(self):
         """Return the state of the device."""
-        return self._data[self.sensor_type]
+        if self._data is not None:
+            return self._data[self.sensor_type]
 
     @property
     def unit_of_measurement(self):
@@ -82,23 +82,26 @@ class LuftdatenSensor(Entity):
     @property
     def unique_id(self) -> str:
         """Return a unique, friendly identifier for this entity."""
-        return '{0}_{1}'.format(self._data['sensor_id'], self.sensor_type)
+        if self._data is not None:
+            return '{0}_{1}'.format(self._data['sensor_id'], self.sensor_type)
 
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        self._attrs[ATTR_SENSOR_ID] = self._data['sensor_id']
         self._attrs[ATTR_ATTRIBUTION] = DEFAULT_ATTRIBUTION
 
-        on_map = ATTR_LATITUDE, ATTR_LONGITUDE
-        no_map = 'lat', 'long'
-        lat_format, lon_format = on_map if self._show_on_map else no_map
-        try:
-            self._attrs[lon_format] = self._data['longitude']
-            self._attrs[lat_format] = self._data['latitude']
-            return self._attrs
-        except KeyError:
-            return
+        if self._data is not None:
+            self._attrs[ATTR_SENSOR_ID] = self._data['sensor_id']
+
+            on_map = ATTR_LATITUDE, ATTR_LONGITUDE
+            no_map = 'lat', 'long'
+            lat_format, lon_format = on_map if self._show_on_map else no_map
+            try:
+                self._attrs[lon_format] = self._data['longitude']
+                self._attrs[lat_format] = self._data['latitude']
+                return self._attrs
+            except KeyError:
+                return
 
     async def async_added_to_hass(self):
         """Register callbacks."""
diff --git a/homeassistant/components/sensor/miflora.py b/homeassistant/components/sensor/miflora.py
index 74bb8261609..412b339caf3 100644
--- a/homeassistant/components/sensor/miflora.py
+++ b/homeassistant/components/sensor/miflora.py
@@ -55,7 +55,7 @@ async def async_setup_platform(hass, config, async_add_entities,
     """Set up the MiFlora sensor."""
     from miflora import miflora_poller
     try:
-        import bluepy.btle  # noqa: F401 pylint: disable=unused-variable
+        import bluepy.btle  # noqa: F401 pylint: disable=unused-import
         from btlewrap import BluepyBackend
         backend = BluepyBackend
     except ImportError:
diff --git a/homeassistant/components/sensor/mitemp_bt.py b/homeassistant/components/sensor/mitemp_bt.py
index 2ae5c29b043..15e225fd2c0 100644
--- a/homeassistant/components/sensor/mitemp_bt.py
+++ b/homeassistant/components/sensor/mitemp_bt.py
@@ -60,7 +60,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the MiTempBt sensor."""
     from mitemp_bt import mitemp_bt_poller
     try:
-        import bluepy.btle  # noqa: F401 pylint: disable=unused-variable
+        import bluepy.btle  # noqa: F401 pylint: disable=unused-import
         from btlewrap import BluepyBackend
         backend = BluepyBackend
     except ImportError:
diff --git a/homeassistant/components/sensor/mqtt.py b/homeassistant/components/sensor/mqtt.py
index 7d0908c5645..49d090f7e1e 100644
--- a/homeassistant/components/sensor/mqtt.py
+++ b/homeassistant/components/sensor/mqtt.py
@@ -14,8 +14,8 @@ import voluptuous as vol
 from homeassistant.core import callback
 from homeassistant.components import sensor
 from homeassistant.components.mqtt import (
-    ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_STATE_TOPIC,
-    CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS,
+    ATTR_DISCOVERY_HASH, CONF_AVAILABILITY_TOPIC, CONF_PAYLOAD_AVAILABLE,
+    CONF_PAYLOAD_NOT_AVAILABLE, CONF_QOS, CONF_STATE_TOPIC, MqttAttributes,
     MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo, subscription)
 from homeassistant.components.mqtt.discovery import MQTT_DISCOVERY_NEW
 from homeassistant.components.sensor import DEVICE_CLASSES_SCHEMA
@@ -52,7 +52,8 @@ PLATFORM_SCHEMA = mqtt.MQTT_RO_PLATFORM_SCHEMA.extend({
     # This is an exception because MQTT is a message transport, not a protocol.
     vol.Optional(CONF_UNIQUE_ID): cv.string,
     vol.Optional(CONF_DEVICE): mqtt.MQTT_ENTITY_DEVICE_INFO_SCHEMA,
-}).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema)
+}).extend(mqtt.MQTT_AVAILABILITY_SCHEMA.schema).extend(
+    mqtt.MQTT_JSON_ATTRS_SCHEMA.schema)
 
 
 async def async_setup_platform(hass: HomeAssistantType, config: ConfigType,
@@ -80,8 +81,8 @@ async def _async_setup_entity(config: ConfigType, async_add_entities,
     async_add_entities([MqttSensor(config, discovery_hash)])
 
 
-class MqttSensor(MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo,
-                 Entity):
+class MqttSensor(MqttAttributes, MqttAvailability, MqttDiscoveryUpdate,
+                 MqttEntityDeviceInfo, Entity):
     """Representation of a sensor that can be updated using MQTT."""
 
     def __init__(self, config, discovery_hash):
@@ -99,6 +100,11 @@ class MqttSensor(MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo,
         qos = config.get(CONF_QOS)
         device_config = config.get(CONF_DEVICE)
 
+        if config.get(CONF_JSON_ATTRS):
+            _LOGGER.warning('configuration variable "json_attributes" is '
+                            'deprecated, replace with "json_attributes_topic"')
+
+        MqttAttributes.__init__(self, config)
         MqttAvailability.__init__(self, availability_topic, qos,
                                   payload_available, payload_not_available)
         MqttDiscoveryUpdate.__init__(self, discovery_hash,
@@ -114,6 +120,7 @@ class MqttSensor(MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo,
         """Handle updated discovery message."""
         config = PLATFORM_SCHEMA(discovery_payload)
         self._config = config
+        await self.attributes_discovery_update(config)
         await self.availability_discovery_update(config)
         await self._subscribe_topics()
         self.async_schedule_update_ha_state()
@@ -171,7 +178,9 @@ class MqttSensor(MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo,
 
     async def async_will_remove_from_hass(self):
         """Unsubscribe when removed."""
-        await subscription.async_unsubscribe_topics(self.hass, self._sub_state)
+        self._sub_state = await subscription.async_unsubscribe_topics(
+            self.hass, self._sub_state)
+        await MqttAttributes.async_will_remove_from_hass(self)
         await MqttAvailability.async_will_remove_from_hass(self)
 
     @callback
diff --git a/homeassistant/components/sensor/mvglive.py b/homeassistant/components/sensor/mvglive.py
index 8634e4f4570..5ec66aafe2f 100644
--- a/homeassistant/components/sensor/mvglive.py
+++ b/homeassistant/components/sensor/mvglive.py
@@ -147,10 +147,10 @@ class MVGLiveData:
         self._products = products
         self._timeoffset = timeoffset
         self._number = number
-        self._include_ubahn = True if 'U-Bahn' in self._products else False
-        self._include_tram = True if 'Tram' in self._products else False
-        self._include_bus = True if 'Bus' in self._products else False
-        self._include_sbahn = True if 'S-Bahn' in self._products else False
+        self._include_ubahn = 'U-Bahn' in self._products
+        self._include_tram = 'Tram' in self._products
+        self._include_bus = 'Bus' in self._products
+        self._include_sbahn = 'S-Bahn' in self._products
         self.mvg = MVGLive.MVGLive()
         self.departures = []
 
diff --git a/homeassistant/components/sensor/mychevy.py b/homeassistant/components/sensor/mychevy.py
index 06d4dade6aa..989126acc20 100644
--- a/homeassistant/components/sensor/mychevy.py
+++ b/homeassistant/components/sensor/mychevy.py
@@ -24,7 +24,8 @@ SENSORS = [
                    "mdi:speedometer"),
     EVSensorConfig("Charged By", "estimatedFullChargeBy"),
     EVSensorConfig("Charge Mode", "chargeMode"),
-    EVSensorConfig("Battery Level", BATTERY_SENSOR, "%", "mdi:battery")
+    EVSensorConfig("Battery Level", BATTERY_SENSOR, "%", "mdi:battery",
+                   ["charging"])
 ]
 
 _LOGGER = logging.getLogger(__name__)
@@ -117,9 +118,11 @@ class EVSensor(Entity):
         self._conn = connection
         self._name = config.name
         self._attr = config.attr
+        self._extra_attrs = config.extra_attrs
         self._unit_of_measurement = config.unit_of_measurement
         self._icon = config.icon
         self._state = None
+        self._state_attributes = {}
         self._car_vid = car_vid
 
         self.entity_id = ENTITY_ID_FORMAT.format(
@@ -141,7 +144,8 @@ class EVSensor(Entity):
     def icon(self):
         """Return the icon."""
         if self._attr == BATTERY_SENSOR:
-            return icon_for_battery_level(self.state)
+            charging = self.state_attributes.get("charging", False)
+            return icon_for_battery_level(self.state, charging)
         return self._icon
 
     @property
@@ -154,6 +158,8 @@ class EVSensor(Entity):
         """Update state."""
         if self._car is not None:
             self._state = getattr(self._car, self._attr, None)
+            for attr in self._extra_attrs:
+                self._state_attributes[attr] = getattr(self._car, attr)
             self.async_schedule_update_ha_state()
 
     @property
@@ -161,6 +167,11 @@ class EVSensor(Entity):
         """Return the state."""
         return self._state
 
+    @property
+    def device_state_attributes(self):
+        """Return all the state attributes."""
+        return self._state_attributes
+
     @property
     def unit_of_measurement(self):
         """Return the unit of measurement the state is expressed in."""
diff --git a/homeassistant/components/sensor/netatmo.py b/homeassistant/components/sensor/netatmo.py
index 7590bccb543..cd4552d91a4 100644
--- a/homeassistant/components/sensor/netatmo.py
+++ b/homeassistant/components/sensor/netatmo.py
@@ -39,6 +39,7 @@ SENSOR_TYPES = {
     'sum_rain_24': ['sum_rain_24', 'mm', 'mdi:weather-rainy', None],
     'battery_vp': ['Battery', '', 'mdi:battery', None],
     'battery_lvl': ['Battery_lvl', '', 'mdi:battery', None],
+    'battery_percent': ['battery_percent', '%', 'mdi:battery', None],
     'min_temp': ['Min Temp.', TEMP_CELSIUS, 'mdi:thermometer', None],
     'max_temp': ['Max Temp.', TEMP_CELSIUS, 'mdi:thermometer', None],
     'windangle': ['Angle', '', 'mdi:compass', None],
@@ -179,6 +180,8 @@ class NetAtmoSensor(Entity):
             self._state = data['CO2']
         elif self.type == 'pressure':
             self._state = round(data['Pressure'], 1)
+        elif self.type == 'battery_percent':
+            self._state = data['battery_percent']
         elif self.type == 'battery_lvl':
             self._state = data['battery_vp']
         elif (self.type == 'battery_vp' and
diff --git a/homeassistant/components/sensor/nmbs.py b/homeassistant/components/sensor/nmbs.py
new file mode 100644
index 00000000000..e13ca18af5f
--- /dev/null
+++ b/homeassistant/components/sensor/nmbs.py
@@ -0,0 +1,220 @@
+"""
+Get ride details and liveboard details for NMBS (Belgian railway).
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/sensor.nmbs/
+"""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.const import CONF_NAME, ATTR_ATTRIBUTION
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity import Entity
+import homeassistant.util.dt as dt_util
+
+_LOGGER = logging.getLogger(__name__)
+
+DEFAULT_NAME = 'NMBS'
+DEFAULT_NAME_LIVE = "NMBS Live"
+
+DEFAULT_ICON = "mdi:train"
+DEFAULT_ICON_ALERT = "mdi:alert-octagon"
+
+CONF_STATION_FROM = 'station_from'
+CONF_STATION_TO = 'station_to'
+CONF_STATION_LIVE = 'station_live'
+
+REQUIREMENTS = ["pyrail==0.0.3"]
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_STATION_FROM): cv.string,
+    vol.Required(CONF_STATION_TO): cv.string,
+    vol.Optional(CONF_STATION_LIVE): cv.string,
+    vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+})
+
+
+def get_time_until(departure_time=None):
+    """Calculate the time between now and a train's departure time."""
+    if departure_time is None:
+        return 0
+
+    delta = dt_util.utc_from_timestamp(int(departure_time)) - dt_util.now()
+    return round((delta.total_seconds() / 60))
+
+
+def get_delay_in_minutes(delay=0):
+    """Get the delay in minutes from a delay in seconds."""
+    return round((int(delay) / 60))
+
+
+def get_ride_duration(departure_time, arrival_time, delay=0):
+    """Calculate the total travel time in minutes."""
+    duration = dt_util.utc_from_timestamp(
+        int(arrival_time)) - dt_util.utc_from_timestamp(int(departure_time))
+    duration_time = int(round((duration.total_seconds() / 60)))
+    return duration_time + get_delay_in_minutes(delay)
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the NMBS sensor with iRail API."""
+    from pyrail import iRail
+    api_client = iRail()
+
+    name = config[CONF_NAME]
+    station_from = config[CONF_STATION_FROM]
+    station_to = config[CONF_STATION_TO]
+    station_live = config.get(CONF_STATION_LIVE)
+
+    sensors = [NMBSSensor(name, station_from, station_to, api_client)]
+
+    if station_live is not None:
+        sensors.append(NMBSLiveBoard(station_live, api_client))
+
+    add_entities(sensors, True)
+
+
+class NMBSLiveBoard(Entity):
+    """Get the next train from a station's liveboard."""
+
+    def __init__(self, live_station, api_client):
+        """Initialize the sensor for getting liveboard data."""
+        self._station = live_station
+        self._api_client = api_client
+        self._attrs = {}
+        self._state = None
+
+    @property
+    def name(self):
+        """Return the sensor default name."""
+        return DEFAULT_NAME_LIVE
+
+    @property
+    def icon(self):
+        """Return the default icon or an alert icon if delays."""
+        if self._attrs is not None and int(self._attrs['delay']) > 0:
+            return DEFAULT_ICON_ALERT
+
+        return DEFAULT_ICON
+
+    @property
+    def state(self):
+        """Return sensor state."""
+        return self._state
+
+    @property
+    def device_state_attributes(self):
+        """Return the sensor attributes if data is available."""
+        if self._state is None or self._attrs is None:
+            return None
+
+        delay = get_delay_in_minutes(self._attrs["delay"])
+        departure = get_time_until(self._attrs['time'])
+
+        attrs = {
+            'departure': "In {} minutes".format(departure),
+            'extra_train': int(self._attrs['isExtra']) > 0,
+            'occupancy': self._attrs['occupancy']['name'],
+            'vehicle_id': self._attrs['vehicle'],
+            ATTR_ATTRIBUTION: "https://api.irail.be/",
+        }
+
+        if delay > 0:
+            attrs['delay'] = "{} minutes".format(delay)
+
+        return attrs
+
+    def update(self):
+        """Set the state equal to the next departure."""
+        liveboard = self._api_client.get_liveboard(self._station)
+        next_departure = liveboard['departures']['departure'][0]
+
+        self._attrs = next_departure
+        self._state = "Track {} - {}".format(
+            next_departure['platform'], next_departure['station'])
+
+
+class NMBSSensor(Entity):
+    """Get the the total travel time for a given connection."""
+
+    def __init__(self, name, station_from, station_to, api_client):
+        """Initialize the NMBS connection sensor."""
+        self._name = name
+        self._station_from = station_from
+        self._station_to = station_to
+        self._api_client = api_client
+        self._attrs = {}
+        self._state = None
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        return 'min'
+
+    @property
+    def icon(self):
+        """Return the sensor default icon or an alert icon if any delay."""
+        if self._attrs is not None:
+            delay = get_delay_in_minutes(self._attrs['departure']['delay'])
+            if delay > 0:
+                return "mdi:alert-octagon"
+
+        return "mdi:train"
+
+    @property
+    def device_state_attributes(self):
+        """Return sensor attributes if data is available."""
+        if self._state is None or self._attrs is None:
+            return None
+
+        delay = get_delay_in_minutes(self._attrs['departure']['delay'])
+        departure = get_time_until(self._attrs['departure']['time'])
+
+        attrs = {
+            'departure': "In {} minutes".format(departure),
+            'direction': self._attrs['departure']['direction']['name'],
+            'occupancy': self._attrs['departure']['occupancy']['name'],
+            "platform_arriving": self._attrs['arrival']['platform'],
+            "platform_departing": self._attrs['departure']['platform'],
+            "vehicle_id": self._attrs['departure']['vehicle'],
+            ATTR_ATTRIBUTION: "https://api.irail.be/",
+        }
+
+        if delay > 0:
+            attrs['delay'] = "{} minutes".format(delay)
+
+        return attrs
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        return self._state
+
+    def update(self):
+        """Set the state to the duration of a connection."""
+        connections = self._api_client.get_connections(
+            self._station_from, self._station_to)
+
+        next_connection = None
+
+        if int(connections['connection'][0]['departure']['left']) > 0:
+            next_connection = connections['connection'][1]
+        else:
+            next_connection = connections['connection'][0]
+
+        self._attrs = next_connection
+
+        duration = get_ride_duration(
+            next_connection['departure']['time'],
+            next_connection['arrival']['time'],
+            next_connection['departure']['delay'],
+        )
+
+        self._state = duration
diff --git a/homeassistant/components/sensor/ohmconnect.py b/homeassistant/components/sensor/ohmconnect.py
index be73cbcf042..3487cab2fcd 100644
--- a/homeassistant/components/sensor/ohmconnect.py
+++ b/homeassistant/components/sensor/ohmconnect.py
@@ -6,7 +6,6 @@ https://home-assistant.io/components/sensor.ohmconnect/
 """
 import logging
 from datetime import timedelta
-import xml.etree.ElementTree as ET
 
 import requests
 import voluptuous as vol
@@ -17,6 +16,8 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.util import Throttle
 from homeassistant.helpers.entity import Entity
 
+REQUIREMENTS = ['defusedxml==0.5.0']
+
 _LOGGER = logging.getLogger(__name__)
 
 CONF_ID = 'id'
@@ -68,6 +69,8 @@ class OhmconnectSensor(Entity):
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     def update(self):
         """Get the latest data from OhmConnect."""
+        import defusedxml.ElementTree as ET
+
         try:
             url = ("https://login.ohmconnect.com"
                    "/verify-ohm-hour/{}").format(self._ohmid)
diff --git a/homeassistant/components/sensor/openweathermap.py b/homeassistant/components/sensor/openweathermap.py
index a8c39616e15..b6a4ff0860e 100644
--- a/homeassistant/components/sensor/openweathermap.py
+++ b/homeassistant/components/sensor/openweathermap.py
@@ -17,7 +17,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import Throttle
 
-REQUIREMENTS = ['pyowm==2.9.0']
+REQUIREMENTS = ['pyowm==2.10.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/sensor/point.py b/homeassistant/components/sensor/point.py
index 1bb46827602..9413cf163d9 100644
--- a/homeassistant/components/sensor/point.py
+++ b/homeassistant/components/sensor/point.py
@@ -6,10 +6,10 @@ https://home-assistant.io/components/sensor.point/
 """
 import logging
 
-from homeassistant.components.point import (
-    DOMAIN as PARENT_DOMAIN, MinutPointEntity)
+from homeassistant.components.point import MinutPointEntity
 from homeassistant.components.point.const import (
     DOMAIN as POINT_DOMAIN, POINT_DISCOVERY_NEW)
+from homeassistant.components.sensor import DOMAIN
 from homeassistant.const import (
     DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_PRESSURE, DEVICE_CLASS_TEMPERATURE,
     TEMP_CELSIUS)
@@ -38,7 +38,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
                             for sensor_type in SENSOR_TYPES), True)
 
     async_dispatcher_connect(
-        hass, POINT_DISCOVERY_NEW.format(PARENT_DOMAIN, POINT_DOMAIN),
+        hass, POINT_DISCOVERY_NEW.format(DOMAIN, POINT_DOMAIN),
         async_discover_sensor)
 
 
diff --git a/homeassistant/components/sensor/prezzibenzina.py b/homeassistant/components/sensor/prezzibenzina.py
new file mode 100644
index 00000000000..972a69ee0d9
--- /dev/null
+++ b/homeassistant/components/sensor/prezzibenzina.py
@@ -0,0 +1,122 @@
+"""
+Support for the PrezziBenzina.it service.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/sensor.prezzibenzina/
+"""
+import datetime as dt
+from datetime import timedelta
+import logging
+
+import voluptuous as vol
+
+from homeassistant.const import ATTR_ATTRIBUTION, ATTR_TIME, CONF_NAME
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.config_validation import PLATFORM_SCHEMA
+from homeassistant.helpers.entity import Entity
+
+REQUIREMENTS = ['prezzibenzina-py==1.1.4']
+
+_LOGGER = logging.getLogger(__name__)
+
+ATTR_FUEL = 'fuel'
+ATTR_SERVICE = 'service'
+ATTRIBUTION = 'Data provided by PrezziBenzina.it'
+
+CONF_STATION = 'station'
+CONF_TYPES = 'fuel_types'
+
+ICON = 'mdi:fuel'
+
+FUEL_TYPES = [
+    'Benzina',
+    "Benzina speciale",
+    'Diesel',
+    "Diesel speciale",
+    'GPL',
+    'Metano',
+]
+
+SCAN_INTERVAL = timedelta(minutes=120)
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_STATION): cv.string,
+    vol.Optional(CONF_NAME, None): cv.string,
+    vol.Optional(CONF_TYPES, None):
+        vol.All(cv.ensure_list, [vol.In(FUEL_TYPES)]),
+})
+
+
+async def async_setup_platform(
+        hass, config, async_add_entities, discovery_info=None):
+    """Set up the PrezziBenzina sensor platform."""
+    from prezzibenzina import PrezziBenzinaPy
+
+    station = config[CONF_STATION]
+    name = config.get(CONF_NAME)
+    types = config.get(CONF_TYPES)
+
+    client = PrezziBenzinaPy()
+    dev = []
+    info = client.get_by_id(station)
+
+    if name is None:
+        name = client.get_station_name(station)
+
+    for index, info in enumerate(info):
+        if types is not None and info['fuel'] not in types:
+            continue
+        dev.append(PrezziBenzinaSensor(
+            index, client, station, name, info['fuel']))
+
+    async_add_entities(dev, True)
+
+
+class PrezziBenzinaSensor(Entity):
+    """Implementation of a PrezziBenzina sensor."""
+
+    def __init__(self, index, client, station, name, ft):
+        """Initialize the PrezziBenzina sensor."""
+        self._client = client
+        self._index = index
+        self._data = None
+        self._station = station
+        self._name = "{} {}".format(name, ft)
+
+    @property
+    def name(self):
+        """Return the name of the sensor."""
+        return self._name
+
+    @property
+    def icon(self):
+        """Icon to use in the frontend, if any."""
+        return ICON
+
+    @property
+    def state(self):
+        """Return the state of the device."""
+        return self._data['price'].replace(" €", "")
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement of this entity, if any."""
+        return self._data['price'].split(" ")[1]
+
+    @property
+    def device_state_attributes(self):
+        """Return the device state attributes of the last update."""
+        timestamp = dt.datetime.strptime(
+            self._data['date'], "%d/%m/%Y %H:%M").isoformat()
+
+        attrs = {
+            ATTR_ATTRIBUTION: ATTRIBUTION,
+            ATTR_FUEL: self._data['fuel'],
+            ATTR_SERVICE: self._data['service'],
+            ATTR_TIME: timestamp,
+        }
+        return attrs
+
+    async def async_update(self):
+        """Get the latest data and updates the states."""
+        self._data = self._client.get_by_id(self._station)[self._index]
diff --git a/homeassistant/components/sensor/ruter.py b/homeassistant/components/sensor/ruter.py
index 7b02b51d0c0..91966f0df9c 100644
--- a/homeassistant/components/sensor/ruter.py
+++ b/homeassistant/components/sensor/ruter.py
@@ -36,7 +36,9 @@ async def async_setup_platform(
         hass, config, async_add_entities, discovery_info=None):
     """Create the sensor."""
     from pyruter.api import Departures
-
+    _LOGGER.warning("The API used in this sensor is shutting down soon, "
+                    "you should consider starting to use the "
+                    "'entur_public_transport' sensor instead")
     stop_id = config[CONF_STOP_ID]
     destination = config.get(CONF_DESTINATION)
     name = config[CONF_NAME]
diff --git a/homeassistant/components/sensor/scrape.py b/homeassistant/components/sensor/scrape.py
index 0174407c7c3..1058d0f43e7 100644
--- a/homeassistant/components/sensor/scrape.py
+++ b/homeassistant/components/sensor/scrape.py
@@ -17,6 +17,7 @@ from homeassistant.const import (
     CONF_PASSWORD, CONF_AUTHENTICATION, HTTP_BASIC_AUTHENTICATION,
     HTTP_DIGEST_AUTHENTICATION)
 from homeassistant.helpers.entity import Entity
+from homeassistant.exceptions import PlatformNotReady
 import homeassistant.helpers.config_validation as cv
 
 REQUIREMENTS = ['beautifulsoup4==4.6.3']
@@ -73,8 +74,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     rest.update()
 
     if rest.data is None:
-        _LOGGER.error("Unable to fetch data from %s", resource)
-        return False
+        raise PlatformNotReady
 
     add_entities([
         ScrapeSensor(rest, name, select, attr, value_template, unit)], True)
diff --git a/homeassistant/components/sensor/seventeentrack.py b/homeassistant/components/sensor/seventeentrack.py
index 7c5dba3b0e1..c77b934fbad 100644
--- a/homeassistant/components/sensor/seventeentrack.py
+++ b/homeassistant/components/sensor/seventeentrack.py
@@ -21,9 +21,12 @@ REQUIREMENTS = ['py17track==2.1.1']
 _LOGGER = logging.getLogger(__name__)
 
 ATTR_DESTINATION_COUNTRY = 'destination_country'
+ATTR_FRIENDLY_NAME = 'friendly_name'
 ATTR_INFO_TEXT = 'info_text'
 ATTR_ORIGIN_COUNTRY = 'origin_country'
+ATTR_PACKAGES = 'packages'
 ATTR_PACKAGE_TYPE = 'package_type'
+ATTR_STATUS = 'status'
 ATTR_TRACKING_INFO_LANGUAGE = 'tracking_info_language'
 ATTR_TRACKING_NUMBER = 'tracking_number'
 
@@ -117,7 +120,7 @@ class SeventeenTrackSummarySensor(Entity):
     @property
     def name(self):
         """Return the name."""
-        return '17track Packages {0}'.format(self._status)
+        return 'Seventeentrack Packages {0}'.format(self._status)
 
     @property
     def state(self):
@@ -139,6 +142,21 @@ class SeventeenTrackSummarySensor(Entity):
         """Update the sensor."""
         await self._data.async_update()
 
+        package_data = []
+        for package in self._data.packages:
+            if package.status != self._status:
+                continue
+
+            package_data.append({
+                ATTR_FRIENDLY_NAME: package.friendly_name,
+                ATTR_INFO_TEXT: package.info_text,
+                ATTR_STATUS: package.status,
+                ATTR_TRACKING_NUMBER: package.tracking_number,
+            })
+
+        if package_data:
+            self._attrs[ATTR_PACKAGES] = package_data
+
         self._state = self._data.summary.get(self._status)
 
 
@@ -186,7 +204,7 @@ class SeventeenTrackPackageSensor(Entity):
         name = self._friendly_name
         if not name:
             name = self._tracking_number
-        return '17track Package: {0}'.format(name)
+        return 'Seventeentrack Package: {0}'.format(name)
 
     @property
     def state(self):
diff --git a/homeassistant/components/sensor/solaredge.py b/homeassistant/components/sensor/solaredge.py
new file mode 100644
index 00000000000..1cabe7c0445
--- /dev/null
+++ b/homeassistant/components/sensor/solaredge.py
@@ -0,0 +1,165 @@
+"""
+Support for SolarEdge Monitoring API.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/sensor.solaredge/
+"""
+
+from datetime import timedelta
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.const import (
+    CONF_API_KEY, CONF_MONITORED_CONDITIONS, CONF_NAME)
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.entity import Entity
+from homeassistant.util import Throttle
+
+REQUIREMENTS = ['solaredge==0.0.2']
+
+# Config for solaredge monitoring api requests.
+CONF_SITE_ID = "site_id"
+
+UPDATE_DELAY = timedelta(minutes=10)
+SCAN_INTERVAL = timedelta(minutes=10)
+
+# Supported sensor types:
+# Key: ['json_key', 'name', unit, icon]
+SENSOR_TYPES = {
+    'life_time_data': ['lifeTimeData', "Lifetime energy", 'Wh',
+                       'mdi:solar-power'],
+    'last_year_data': ['lastYearData', "Energy this year", 'Wh',
+                       'mdi:solar-power'],
+    'last_month_data': ['lastMonthData', "Energy this month", 'Wh',
+                        'mdi:solar-power'],
+    'last_day_data': ['lastDayData', "Energy today", 'Wh',
+                      'mdi:solar-power'],
+    'current_power': ['currentPower', "Current Power", 'W',
+                      'mdi:solar-power']
+}
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_API_KEY): cv.string,
+    vol.Required(CONF_SITE_ID): cv.string,
+    vol.Optional(CONF_NAME, default='SolarEdge'): cv.string,
+    vol.Optional(CONF_MONITORED_CONDITIONS, default=['current_power']):
+    vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)])
+})
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Create the SolarEdge Monitoring API sensor."""
+    import solaredge
+    from requests.exceptions import HTTPError, ConnectTimeout
+
+    api_key = config[CONF_API_KEY]
+    site_id = config[CONF_SITE_ID]
+    platform_name = config[CONF_NAME]
+
+    # Create new SolarEdge object to retrieve data
+    api = solaredge.Solaredge(api_key)
+
+    # Check if api can be reached and site is active
+    try:
+        response = api.get_details(site_id)
+
+        if response['details']['status'].lower() != 'active':
+            _LOGGER.error("SolarEdge site is not active")
+            return
+        _LOGGER.debug("Credentials correct and site is active")
+    except KeyError:
+        _LOGGER.error("Missing details data in solaredge response")
+        return
+    except (ConnectTimeout, HTTPError):
+        _LOGGER.error("Could not retrieve details from SolarEdge API")
+        return
+
+    # Create solaredge data service which will retrieve and update the data.
+    data = SolarEdgeData(hass, api, site_id)
+
+    # Create a new sensor for each sensor type.
+    entities = []
+    for sensor_key in config[CONF_MONITORED_CONDITIONS]:
+        sensor = SolarEdgeSensor(platform_name, sensor_key, data)
+        entities.append(sensor)
+
+    add_entities(entities, True)
+
+
+class SolarEdgeSensor(Entity):
+    """Representation of an SolarEdge Monitoring API sensor."""
+
+    def __init__(self, platform_name, sensor_key, data):
+        """Initialize the sensor."""
+        self.platform_name = platform_name
+        self.sensor_key = sensor_key
+        self.data = data
+        self._state = None
+
+        self._json_key = SENSOR_TYPES[self.sensor_key][0]
+        self._unit_of_measurement = SENSOR_TYPES[self.sensor_key][2]
+
+    @property
+    def name(self):
+        """Return the name."""
+        return "{}_{}".format(self.platform_name, self.sensor_key)
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement."""
+        return self._unit_of_measurement
+
+    @property
+    def icon(self):
+        """Return the sensor icon."""
+        return SENSOR_TYPES[self.sensor_key][3]
+
+    @property
+    def state(self):
+        """Return the state of the sensor."""
+        return self._state
+
+    def update(self):
+        """Get the latest data from the sensor and update the state."""
+        self.data.update()
+        self._state = self.data.data[self._json_key]
+
+
+class SolarEdgeData:
+    """Get and update the latest data."""
+
+    def __init__(self, hass, api, site_id):
+        """Initialize the data object."""
+        self.hass = hass
+        self.api = api
+        self.data = {}
+        self.site_id = site_id
+
+    @Throttle(UPDATE_DELAY)
+    def update(self):
+        """Update the data from the SolarEdge Monitoring API."""
+        from requests.exceptions import HTTPError, ConnectTimeout
+
+        try:
+            data = self.api.get_overview(self.site_id)
+            overview = data['overview']
+        except KeyError:
+            _LOGGER.error("Missing overview data, skipping update")
+            return
+        except (ConnectTimeout, HTTPError):
+            _LOGGER.error("Could not retrieve data, skipping update")
+            return
+
+        self.data = {}
+
+        for key, value in overview.items():
+            if 'energy' in value:
+                self.data[key] = value['energy']
+            elif 'power' in value:
+                self.data[key] = value['power']
+
+        _LOGGER.debug("Updated SolarEdge overview data: %s", self.data)
diff --git a/homeassistant/components/sensor/sql.py b/homeassistant/components/sensor/sql.py
index b3ce8fc28a0..1533aa94822 100644
--- a/homeassistant/components/sensor/sql.py
+++ b/homeassistant/components/sensor/sql.py
@@ -20,7 +20,7 @@ from homeassistant.helpers.entity import Entity
 
 _LOGGER = logging.getLogger(__name__)
 
-REQUIREMENTS = ['sqlalchemy==1.2.14']
+REQUIREMENTS = ['sqlalchemy==1.2.15']
 
 CONF_COLUMN_NAME = 'column'
 CONF_QUERIES = 'queries'
diff --git a/homeassistant/components/sensor/statistics.py b/homeassistant/components/sensor/statistics.py
index e011121f4a2..01c783dc1db 100644
--- a/homeassistant/components/sensor/statistics.py
+++ b/homeassistant/components/sensor/statistics.py
@@ -80,8 +80,7 @@ class StatisticsSensor(Entity):
                  precision):
         """Initialize the Statistics sensor."""
         self._entity_id = entity_id
-        self.is_binary = True if self._entity_id.split('.')[0] == \
-            'binary_sensor' else False
+        self.is_binary = self._entity_id.split('.')[0] == 'binary_sensor'
         if not self.is_binary:
             self._name = '{} {}'.format(name, ATTR_MEAN)
         else:
diff --git a/homeassistant/components/sensor/systemmonitor.py b/homeassistant/components/sensor/systemmonitor.py
index 212602aa72c..dbb2f4ed032 100644
--- a/homeassistant/components/sensor/systemmonitor.py
+++ b/homeassistant/components/sensor/systemmonitor.py
@@ -23,27 +23,27 @@ _LOGGER = logging.getLogger(__name__)
 CONF_ARG = 'arg'
 
 SENSOR_TYPES = {
-    'disk_free': ['Disk free', 'GiB', 'mdi:harddisk'],
-    'disk_use': ['Disk use', 'GiB', 'mdi:harddisk'],
-    'disk_use_percent': ['Disk use (percent)', '%', 'mdi:harddisk'],
-    'ipv4_address': ['IPv4 address', '', 'mdi:server-network'],
-    'ipv6_address': ['IPv6 address', '', 'mdi:server-network'],
-    'last_boot': ['Last boot', '', 'mdi:clock'],
-    'load_15m': ['Load (15m)', ' ', 'mdi:memory'],
-    'load_1m': ['Load (1m)', ' ', 'mdi:memory'],
-    'load_5m': ['Load (5m)', ' ', 'mdi:memory'],
-    'memory_free': ['Memory free', 'MiB', 'mdi:memory'],
-    'memory_use': ['Memory use', 'MiB', 'mdi:memory'],
-    'memory_use_percent': ['Memory use (percent)', '%', 'mdi:memory'],
-    'network_in': ['Network in', 'MiB', 'mdi:server-network'],
-    'network_out': ['Network out', 'MiB', 'mdi:server-network'],
-    'packets_in': ['Packets in', ' ', 'mdi:server-network'],
-    'packets_out': ['Packets out', ' ', 'mdi:server-network'],
-    'process': ['Process', ' ', 'mdi:memory'],
-    'processor_use': ['Processor use', '%', 'mdi:memory'],
-    'swap_free': ['Swap free', 'MiB', 'mdi:harddisk'],
-    'swap_use': ['Swap use', 'MiB', 'mdi:harddisk'],
-    'swap_use_percent': ['Swap use (percent)', '%', 'mdi:harddisk'],
+    'disk_free': ['Disk free', 'GiB', 'mdi:harddisk', None],
+    'disk_use': ['Disk use', 'GiB', 'mdi:harddisk', None],
+    'disk_use_percent': ['Disk use (percent)', '%', 'mdi:harddisk', None],
+    'ipv4_address': ['IPv4 address', '', 'mdi:server-network', None],
+    'ipv6_address': ['IPv6 address', '', 'mdi:server-network', None],
+    'last_boot': ['Last boot', '', 'mdi:clock', 'timestamp'],
+    'load_15m': ['Load (15m)', ' ', 'mdi:memory', None],
+    'load_1m': ['Load (1m)', ' ', 'mdi:memory', None],
+    'load_5m': ['Load (5m)', ' ', 'mdi:memory', None],
+    'memory_free': ['Memory free', 'MiB', 'mdi:memory', None],
+    'memory_use': ['Memory use', 'MiB', 'mdi:memory', None],
+    'memory_use_percent': ['Memory use (percent)', '%', 'mdi:memory', None],
+    'network_in': ['Network in', 'MiB', 'mdi:server-network', None],
+    'network_out': ['Network out', 'MiB', 'mdi:server-network', None],
+    'packets_in': ['Packets in', ' ', 'mdi:server-network', None],
+    'packets_out': ['Packets out', ' ', 'mdi:server-network', None],
+    'process': ['Process', ' ', 'mdi:memory', None],
+    'processor_use': ['Processor use', '%', 'mdi:memory', None],
+    'swap_free': ['Swap free', 'MiB', 'mdi:harddisk', None],
+    'swap_use': ['Swap use', 'MiB', 'mdi:harddisk', None],
+    'swap_use_percent': ['Swap use (percent)', '%', 'mdi:harddisk', None],
 }
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
@@ -95,6 +95,11 @@ class SystemMonitorSensor(Entity):
         """Return the name of the sensor."""
         return self._name.rstrip()
 
+    @property
+    def device_class(self):
+        """Return the class of this sensor."""
+        return SENSOR_TYPES[self.type][3]
+
     @property
     def icon(self):
         """Icon to use in the frontend, if any."""
diff --git a/homeassistant/components/sensor/tautulli.py b/homeassistant/components/sensor/tautulli.py
index f47f0e5c382..aa651a9ab1a 100644
--- a/homeassistant/components/sensor/tautulli.py
+++ b/homeassistant/components/sensor/tautulli.py
@@ -12,14 +12,14 @@ import voluptuous as vol
 from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.const import (
     CONF_API_KEY, CONF_HOST, CONF_MONITORED_CONDITIONS, CONF_NAME, CONF_PORT,
-    CONF_SSL, CONF_VERIFY_SSL)
+    CONF_SSL, CONF_VERIFY_SSL, CONF_PATH)
 from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import Throttle
 
-REQUIREMENTS = ['pytautulli==0.4.1']
+REQUIREMENTS = ['pytautulli==0.5.0']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -27,6 +27,7 @@ CONF_MONITORED_USERS = 'monitored_users'
 
 DEFAULT_NAME = 'Tautulli'
 DEFAULT_PORT = '8181'
+DEFAULT_PATH = ''
 DEFAULT_SSL = False
 DEFAULT_VERIFY_SSL = True
 
@@ -40,6 +41,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Optional(CONF_MONITORED_USERS): vol.All(cv.ensure_list, [cv.string]),
     vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
     vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.string,
+    vol.Optional(CONF_PATH, default=DEFAULT_PATH): cv.string,
     vol.Optional(CONF_SSL, default=DEFAULT_SSL): cv.boolean,
     vol.Optional(CONF_VERIFY_SSL, default=DEFAULT_VERIFY_SSL): cv.boolean,
 })
@@ -53,6 +55,7 @@ async def async_setup_platform(
     name = config.get(CONF_NAME)
     host = config[CONF_HOST]
     port = config.get(CONF_PORT)
+    path = config.get(CONF_PATH)
     api_key = config[CONF_API_KEY]
     monitored_conditions = config.get(CONF_MONITORED_CONDITIONS)
     user = config.get(CONF_MONITORED_USERS)
@@ -61,7 +64,7 @@ async def async_setup_platform(
 
     session = async_get_clientsession(hass, verify_ssl)
     tautulli = TautulliData(Tautulli(
-        host, port, api_key, hass.loop, session, use_ssl))
+        host, port, api_key, hass.loop, session, use_ssl, path))
 
     if not await tautulli.test_connection():
         raise PlatformNotReady
diff --git a/homeassistant/components/sensor/tellduslive.py b/homeassistant/components/sensor/tellduslive.py
index 4afff115b9d..f024f62109b 100644
--- a/homeassistant/components/sensor/tellduslive.py
+++ b/homeassistant/components/sensor/tellduslive.py
@@ -6,11 +6,12 @@ https://home-assistant.io/components/sensor.tellduslive/
 """
 import logging
 
-from homeassistant.components import tellduslive
+from homeassistant.components import sensor, tellduslive
 from homeassistant.components.tellduslive.entry import TelldusLiveEntity
 from homeassistant.const import (
     DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_ILLUMINANCE, DEVICE_CLASS_TEMPERATURE,
     TEMP_CELSIUS)
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -46,12 +47,25 @@ SENSOR_TYPES = {
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up the Tellstick sensors."""
-    if discovery_info is None:
-        return
-    client = hass.data[tellduslive.DOMAIN]
-    add_entities(
-        TelldusLiveSensor(client, sensor) for sensor in discovery_info)
+    """Old way of setting up TelldusLive.
+
+    Can only be called when a user accidentally mentions the platform in their
+    config. But even in that case it would have been ignored.
+    """
+    pass
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up tellduslive sensors dynamically."""
+    async def async_discover_sensor(device_id):
+        """Discover and add a discovered sensor."""
+        client = hass.data[tellduslive.DOMAIN]
+        async_add_entities([TelldusLiveSensor(client, device_id)])
+
+    async_dispatcher_connect(
+        hass,
+        tellduslive.TELLDUS_DISCOVERY_NEW.format(
+            sensor.DOMAIN, tellduslive.DOMAIN), async_discover_sensor)
 
 
 class TelldusLiveSensor(TelldusLiveEntity):
@@ -132,4 +146,4 @@ class TelldusLiveSensor(TelldusLiveEntity):
     @property
     def unique_id(self) -> str:
         """Return a unique ID."""
-        return "-".join(self._id[0:2])
+        return "{}-{}-{}".format(*self._id)
diff --git a/homeassistant/components/sensor/upnp.py b/homeassistant/components/sensor/upnp.py
index c05e2ce0ade..8eccf8834a1 100644
--- a/homeassistant/components/sensor/upnp.py
+++ b/homeassistant/components/sensor/upnp.py
@@ -10,7 +10,7 @@ import logging
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity
-from homeassistant.components.upnp.const import DOMAIN as DATA_UPNP
+from homeassistant.components.upnp.const import DOMAIN as DOMAIN_UPNP
 from homeassistant.components.upnp.const import SIGNAL_REMOVE_SENSOR
 
 
@@ -73,8 +73,13 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
         async_add_entities(sensors, True)
 
     data = config_entry.data
-    udn = data['udn']
-    device = hass.data[DATA_UPNP]['devices'][udn]
+    if 'udn' in data:
+        udn = data['udn']
+    else:
+        # any device will do
+        udn = list(hass.data[DOMAIN_UPNP]['devices'].keys())[0]
+
+    device = hass.data[DOMAIN_UPNP]['devices'][udn]
     async_add_sensor(device)
 
 
@@ -100,6 +105,17 @@ class UpnpSensor(Entity):
 
         self.hass.async_create_task(self.async_remove())
 
+    @property
+    def device_info(self):
+        """Get device info."""
+        return {
+            'identifiers': {
+                (DOMAIN_UPNP, self.unique_id)
+            },
+            'name': self.name,
+            'via_hub': (DOMAIN_UPNP, self._device.udn),
+        }
+
 
 class RawUPnPIGDSensor(UpnpSensor):
     """Representation of a UPnP/IGD sensor."""
diff --git a/homeassistant/components/sensor/xiaomi_aqara.py b/homeassistant/components/sensor/xiaomi_aqara.py
index 33517e957b9..1859b7be16a 100644
--- a/homeassistant/components/sensor/xiaomi_aqara.py
+++ b/homeassistant/components/sensor/xiaomi_aqara.py
@@ -107,5 +107,8 @@ class XiaomiSensor(XiaomiDevice):
             return False
         if self._data_key == 'pressure' and value == 0:
             return False
-        self._state = round(value, 1)
+        if self._data_key in ['illumination', 'lux']:
+            self._state = round(value)
+        else:
+            self._state = round(value, 1)
         return True
diff --git a/homeassistant/components/sensor/zha.py b/homeassistant/components/sensor/zha.py
index 80aad9ac937..41499cddcb2 100644
--- a/homeassistant/components/sensor/zha.py
+++ b/homeassistant/components/sensor/zha.py
@@ -9,7 +9,8 @@ import logging
 from homeassistant.components.sensor import DOMAIN
 from homeassistant.components.zha import helpers
 from homeassistant.components.zha.const import (
-    DATA_ZHA, DATA_ZHA_DISPATCHERS, ZHA_DISCOVERY_NEW)
+    DATA_ZHA, DATA_ZHA_DISPATCHERS, REPORT_CONFIG_MAX_INT,
+    REPORT_CONFIG_MIN_INT, REPORT_CONFIG_RPT_CHANGE, ZHA_DISCOVERY_NEW)
 from homeassistant.components.zha.entities import ZhaEntity
 from homeassistant.const import TEMP_CELSIUS
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -61,11 +62,14 @@ async def make_sensor(discovery_info):
     )
     from zigpy.zcl.clusters.smartenergy import Metering
     from zigpy.zcl.clusters.homeautomation import ElectricalMeasurement
+    from zigpy.zcl.clusters.general import PowerConfiguration
     in_clusters = discovery_info['in_clusters']
     if 'sub_component' in discovery_info:
         sensor = discovery_info['sub_component'](**discovery_info)
     elif RelativeHumidity.cluster_id in in_clusters:
         sensor = RelativeHumiditySensor(**discovery_info)
+    elif PowerConfiguration.cluster_id in in_clusters:
+        sensor = GenericBatterySensor(**discovery_info)
     elif TemperatureMeasurement.cluster_id in in_clusters:
         sensor = TemperatureSensor(**discovery_info)
     elif PressureMeasurement.cluster_id in in_clusters:
@@ -80,13 +84,6 @@ async def make_sensor(discovery_info):
     else:
         sensor = Sensor(**discovery_info)
 
-    if discovery_info['new_join']:
-        cluster = list(in_clusters.values())[0]
-        await helpers.configure_reporting(
-            sensor.entity_id, cluster, sensor.value_attribute,
-            reportable_change=sensor.min_reportable_change
-        )
-
     return sensor
 
 
@@ -95,12 +92,28 @@ class Sensor(ZhaEntity):
 
     _domain = DOMAIN
     value_attribute = 0
-    min_reportable_change = 1
+    min_report_interval = REPORT_CONFIG_MIN_INT
+    max_report_interval = REPORT_CONFIG_MAX_INT
+    min_reportable_change = REPORT_CONFIG_RPT_CHANGE
+    report_config = (min_report_interval, max_report_interval,
+                     min_reportable_change)
+
+    def __init__(self, **kwargs):
+        """Init ZHA Sensor instance."""
+        super().__init__(**kwargs)
+        self._cluster = list(kwargs['in_clusters'].values())[0]
 
     @property
-    def should_poll(self) -> bool:
-        """State gets pushed from device."""
-        return False
+    def zcl_reporting_config(self) -> dict:
+        """Return a dict of attribute reporting configuration."""
+        return {
+            self.cluster: {self.value_attribute: self.report_config}
+        }
+
+    @property
+    def cluster(self):
+        """Return Sensor's cluster."""
+        return self._cluster
 
     @property
     def state(self) -> str:
@@ -119,7 +132,7 @@ class Sensor(ZhaEntity):
     async def async_update(self):
         """Retrieve latest state."""
         result = await helpers.safe_read(
-            list(self._in_clusters.values())[0],
+            self.cluster,
             [self.value_attribute],
             allow_cache=False,
             only_cache=(not self._initialized)
@@ -127,6 +140,71 @@ class Sensor(ZhaEntity):
         self._state = result.get(self.value_attribute, self._state)
 
 
+class GenericBatterySensor(Sensor):
+    """ZHA generic battery sensor."""
+
+    report_attribute = 32
+    value_attribute = 33
+    battery_sizes = {
+        0: 'No battery',
+        1: 'Built in',
+        2: 'Other',
+        3: 'AA',
+        4: 'AAA',
+        5: 'C',
+        6: 'D',
+        7: 'CR2',
+        8: 'CR123A',
+        9: 'CR2450',
+        10: 'CR2032',
+        11: 'CR1632',
+        255: 'Unknown'
+    }
+
+    @property
+    def unit_of_measurement(self):
+        """Return the unit of measurement of this entity."""
+        return '%'
+
+    @property
+    def zcl_reporting_config(self) -> dict:
+        """Return a dict of attribute reporting configuration."""
+        return {
+            self.cluster: {
+                self.value_attribute: self.report_config,
+                self.report_attribute: self.report_config
+            }
+        }
+
+    async def async_update(self):
+        """Retrieve latest state."""
+        _LOGGER.debug("%s async_update", self.entity_id)
+
+        result = await helpers.safe_read(
+            self._endpoint.power,
+            [
+                'battery_size',
+                'battery_quantity',
+                'battery_percentage_remaining'
+            ],
+            allow_cache=False,
+            only_cache=(not self._initialized)
+        )
+        self._device_state_attributes['battery_size'] = self.battery_sizes.get(
+            result.get('battery_size', 255), 'Unknown')
+        self._device_state_attributes['battery_quantity'] = result.get(
+            'battery_quantity', 'Unknown')
+        self._state = result.get('battery_percentage_remaining', self._state)
+
+    @property
+    def state(self):
+        """Return the state of the entity."""
+        if self._state == 'unknown' or self._state is None:
+            return None
+
+        return self._state
+
+
 class TemperatureSensor(Sensor):
     """ZHA temperature sensor."""
 
@@ -251,6 +329,6 @@ class ElectricalMeasurementSensor(Sensor):
         _LOGGER.debug("%s async_update", self.entity_id)
 
         result = await helpers.safe_read(
-            self._endpoint.electrical_measurement, ['active_power'],
+            self.cluster, ['active_power'],
             allow_cache=False, only_cache=(not self._initialized))
         self._state = result.get('active_power', self._state)
diff --git a/homeassistant/components/sensor/zoneminder.py b/homeassistant/components/sensor/zoneminder.py
index 8e4b57f1f38..16513dc58de 100644
--- a/homeassistant/components/sensor/zoneminder.py
+++ b/homeassistant/components/sensor/zoneminder.py
@@ -64,7 +64,8 @@ class ZMSensorMonitors(Entity):
     def __init__(self, monitor):
         """Initialize monitor sensor."""
         self._monitor = monitor
-        self._state = monitor.function.value
+        self._state = None
+        self._is_available = None
 
     @property
     def name(self):
@@ -76,6 +77,11 @@ class ZMSensorMonitors(Entity):
         """Return the state of the sensor."""
         return self._state
 
+    @property
+    def available(self):
+        """Return True if Monitor is available."""
+        return self._is_available
+
     def update(self):
         """Update the sensor."""
         state = self._monitor.function
@@ -83,6 +89,7 @@ class ZMSensorMonitors(Entity):
             self._state = None
         else:
             self._state = state.value
+        self._is_available = self._monitor.is_available
 
 
 class ZMSensorEvents(Entity):
@@ -123,6 +130,7 @@ class ZMSensorRunState(Entity):
     def __init__(self, client):
         """Initialize run state sensor."""
         self._state = None
+        self._is_available = None
         self._client = client
 
     @property
@@ -135,6 +143,12 @@ class ZMSensorRunState(Entity):
         """Return the state of the sensor."""
         return self._state
 
+    @property
+    def available(self):
+        """Return True if ZoneMinder is available."""
+        return self._is_available
+
     def update(self):
         """Update the sensor."""
         self._state = self._client.get_active_state()
+        self._is_available = self._client.is_available
diff --git a/homeassistant/components/simplisafe/.translations/ca.json b/homeassistant/components/simplisafe/.translations/ca.json
index 1662162c439..a02c3a5e28e 100644
--- a/homeassistant/components/simplisafe/.translations/ca.json
+++ b/homeassistant/components/simplisafe/.translations/ca.json
@@ -11,7 +11,7 @@
                     "password": "Contrasenya",
                     "username": "Correu electr\u00f2nic"
                 },
-                "title": "Introdu\u00efu la vostra informaci\u00f3"
+                "title": "Introdueix la teva informaci\u00f3"
             }
         },
         "title": "SimpliSafe"
diff --git a/homeassistant/components/simplisafe/.translations/hu.json b/homeassistant/components/simplisafe/.translations/hu.json
index 103bf4e18d0..613b5565470 100644
--- a/homeassistant/components/simplisafe/.translations/hu.json
+++ b/homeassistant/components/simplisafe/.translations/hu.json
@@ -1,6 +1,7 @@
 {
     "config": {
         "error": {
+            "identifier_exists": "Fi\u00f3k m\u00e1r regisztr\u00e1lva van",
             "invalid_credentials": "\u00c9rv\u00e9nytelen hiteles\u00edt\u0151 adatok"
         },
         "step": {
@@ -11,6 +12,7 @@
                 },
                 "title": "T\u00f6ltsd ki az adataid"
             }
-        }
+        },
+        "title": "SimpliSafe"
     }
 }
\ No newline at end of file
diff --git a/homeassistant/components/skybell.py b/homeassistant/components/skybell.py
index b3c3b63bd84..ee384fd7094 100644
--- a/homeassistant/components/skybell.py
+++ b/homeassistant/components/skybell.py
@@ -14,7 +14,7 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 
-REQUIREMENTS = ['skybellpy==0.2.0']
+REQUIREMENTS = ['skybellpy==0.3.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/smhi/.translations/ca.json b/homeassistant/components/smhi/.translations/ca.json
index 23b6a2934f0..e265df40217 100644
--- a/homeassistant/components/smhi/.translations/ca.json
+++ b/homeassistant/components/smhi/.translations/ca.json
@@ -2,7 +2,7 @@
     "config": {
         "error": {
             "name_exists": "El nom ja existeix",
-            "wrong_location": "Ubicaci\u00f3 nom\u00e9s a Su\u00e8cia"
+            "wrong_location": "La ubicaci\u00f3 ha d'estar a Su\u00e8cia"
         },
         "step": {
             "user": {
diff --git a/homeassistant/components/smhi/.translations/hu.json b/homeassistant/components/smhi/.translations/hu.json
index 86fed8933ef..425cf927631 100644
--- a/homeassistant/components/smhi/.translations/hu.json
+++ b/homeassistant/components/smhi/.translations/hu.json
@@ -1,14 +1,17 @@
 {
     "config": {
         "error": {
-            "name_exists": "A n\u00e9v m\u00e1r l\u00e9tezik"
+            "name_exists": "A n\u00e9v m\u00e1r l\u00e9tezik",
+            "wrong_location": "Csak sv\u00e9dorsz\u00e1gi helysz\u00edn megengedett"
         },
         "step": {
             "user": {
                 "data": {
                     "latitude": "Sz\u00e9less\u00e9g",
-                    "longitude": "Hossz\u00fas\u00e1g"
-                }
+                    "longitude": "Hossz\u00fas\u00e1g",
+                    "name": "N\u00e9v"
+                },
+                "title": "Helysz\u00edn Sv\u00e9dorsz\u00e1gban"
             }
         }
     }
diff --git a/homeassistant/components/sonos/.translations/ca.json b/homeassistant/components/sonos/.translations/ca.json
index a6f1f99a379..67fd26f1b5a 100644
--- a/homeassistant/components/sonos/.translations/ca.json
+++ b/homeassistant/components/sonos/.translations/ca.json
@@ -6,7 +6,7 @@
         },
         "step": {
             "confirm": {
-                "description": "Voleu configurar Sonos?",
+                "description": "Vols configurar Sonos?",
                 "title": "Sonos"
             }
         },
diff --git a/homeassistant/components/spaceapi.py b/homeassistant/components/spaceapi.py
index eaf1508071a..fa2e5e8e1ea 100644
--- a/homeassistant/components/spaceapi.py
+++ b/homeassistant/components/spaceapi.py
@@ -129,7 +129,7 @@ class APISpaceApiView(HomeAssistantView):
 
         if space_state is not None:
             state = {
-                ATTR_OPEN: False if space_state.state == 'off' else True,
+                ATTR_OPEN: space_state.state != 'off',
                 ATTR_LASTCHANGE:
                     dt_util.as_timestamp(space_state.last_updated),
             }
diff --git a/homeassistant/components/splunk.py b/homeassistant/components/splunk.py
index 28863f6a436..37f56ed3b1c 100644
--- a/homeassistant/components/splunk.py
+++ b/homeassistant/components/splunk.py
@@ -12,7 +12,8 @@ import requests
 import voluptuous as vol
 
 from homeassistant.const import (
-    CONF_SSL, CONF_HOST, CONF_NAME, CONF_PORT, CONF_TOKEN, EVENT_STATE_CHANGED)
+    CONF_SSL, CONF_VERIFY_SSL, CONF_HOST, CONF_NAME,
+    CONF_PORT, CONF_TOKEN, EVENT_STATE_CHANGED)
 from homeassistant.helpers import state as state_helper
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.json import JSONEncoder
@@ -32,6 +33,7 @@ CONFIG_SCHEMA = vol.Schema({
         vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
         vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
         vol.Optional(CONF_SSL, default=False): cv.boolean,
+        vol.Optional(CONF_VERIFY_SSL, default=True): cv.boolean,
         vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
     }),
 }, extra=vol.ALLOW_EXTRA)
@@ -44,6 +46,7 @@ def setup(hass, config):
     port = conf.get(CONF_PORT)
     token = conf.get(CONF_TOKEN)
     use_ssl = conf.get(CONF_SSL)
+    verify_ssl = conf.get(CONF_VERIFY_SSL)
     name = conf.get(CONF_NAME)
 
     if use_ssl:
@@ -85,7 +88,7 @@ def setup(hass, config):
             }
             requests.post(event_collector,
                           data=json.dumps(payload, cls=JSONEncoder),
-                          headers=headers, timeout=10)
+                          headers=headers, timeout=10, verify=verify_ssl)
         except requests.exceptions.RequestException as error:
             _LOGGER.exception("Error saving event to Splunk: %s", error)
 
diff --git a/homeassistant/components/switch/__init__.py b/homeassistant/components/switch/__init__.py
index 1adabe4b57e..513ebbcb5ea 100644
--- a/homeassistant/components/switch/__init__.py
+++ b/homeassistant/components/switch/__init__.py
@@ -39,7 +39,7 @@ PROP_TO_ATTR = {
 }
 
 SWITCH_SERVICE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
 })
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/switch/esphome.py b/homeassistant/components/switch/esphome.py
new file mode 100644
index 00000000000..4bf4b416b8d
--- /dev/null
+++ b/homeassistant/components/switch/esphome.py
@@ -0,0 +1,68 @@
+"""Support for ESPHome switches."""
+import logging
+
+from typing import TYPE_CHECKING, Optional
+
+from homeassistant.components.esphome import EsphomeEntity, \
+    platform_async_setup_entry
+from homeassistant.components.switch import SwitchDevice
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.helpers.typing import HomeAssistantType
+
+if TYPE_CHECKING:
+    # pylint: disable=unused-import
+    from aioesphomeapi import SwitchInfo, SwitchState  # noqa
+
+DEPENDENCIES = ['esphome']
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(hass: HomeAssistantType,
+                            entry: ConfigEntry, async_add_entities) -> None:
+    """Set up ESPHome switches based on a config entry."""
+    # pylint: disable=redefined-outer-name
+    from aioesphomeapi import SwitchInfo, SwitchState  # noqa
+
+    await platform_async_setup_entry(
+        hass, entry, async_add_entities,
+        component_key='switch',
+        info_type=SwitchInfo, entity_type=EsphomeSwitch,
+        state_type=SwitchState
+    )
+
+
+class EsphomeSwitch(EsphomeEntity, SwitchDevice):
+    """A switch implementation for ESPHome."""
+
+    @property
+    def _static_info(self) -> 'SwitchInfo':
+        return super()._static_info
+
+    @property
+    def _state(self) -> Optional['SwitchState']:
+        return super()._state
+
+    @property
+    def icon(self) -> str:
+        """Return the icon."""
+        return self._static_info.icon
+
+    @property
+    def assumed_state(self) -> bool:
+        """Return true if we do optimistic updates."""
+        return self._static_info.optimistic
+
+    @property
+    def is_on(self):
+        """Return true if the switch is on."""
+        if self._state is None:
+            return None
+        return self._state.state
+
+    async def async_turn_on(self, **kwargs):
+        """Turn the entity on."""
+        await self._client.switch_command(self._static_info.key, True)
+
+    async def async_turn_off(self, **kwargs):
+        """Turn the entity off."""
+        await self._client.switch_command(self._static_info.key, False)
diff --git a/homeassistant/components/switch/homekit_controller.py b/homeassistant/components/switch/homekit_controller.py
index 6333375b560..51a71163bad 100644
--- a/homeassistant/components/switch/homekit_controller.py
+++ b/homeassistant/components/switch/homekit_controller.py
@@ -35,11 +35,12 @@ class HomeKitSwitch(HomeKitEntity, SwitchDevice):
 
     def update_characteristics(self, characteristics):
         """Synchronise the switch state with Home Assistant."""
-        import homekit  # pylint: disable=import-error
+        # pylint: disable=import-error
+        from homekit.model.characteristics import CharacteristicsTypes
 
         for characteristic in characteristics:
             ctype = characteristic['type']
-            ctype = homekit.CharacteristicsTypes.get_short(ctype)
+            ctype = CharacteristicsTypes.get_short(ctype)
             if ctype == "on":
                 self._chars['on'] = characteristic['iid']
                 self._on = characteristic['value']
diff --git a/homeassistant/components/switch/homematicip_cloud.py b/homeassistant/components/switch/homematicip_cloud.py
index e066c861dfb..a1b3e1789bf 100644
--- a/homeassistant/components/switch/homematicip_cloud.py
+++ b/homeassistant/components/switch/homematicip_cloud.py
@@ -29,7 +29,11 @@ async def async_setup_platform(
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the HomematicIP switch from a config entry."""
     from homematicip.device import (
-        PlugableSwitch, PlugableSwitchMeasuring, BrandSwitchMeasuring)
+        PlugableSwitch,
+        PlugableSwitchMeasuring,
+        BrandSwitchMeasuring,
+        FullFlushSwitchMeasuring,
+    )
 
     home = hass.data[HMIPC_DOMAIN][config_entry.data[HMIPC_HAPID]].home
     devices = []
@@ -39,7 +43,8 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
             # This device is implemented in the light platform and will
             # not be added in the switch platform
             pass
-        elif isinstance(device, PlugableSwitchMeasuring):
+        elif isinstance(device, (PlugableSwitchMeasuring,
+                                 FullFlushSwitchMeasuring)):
             devices.append(HomematicipSwitchMeasuring(home, device))
         elif isinstance(device, PlugableSwitch):
             devices.append(HomematicipSwitch(home, device))
diff --git a/homeassistant/components/switch/lutron.py b/homeassistant/components/switch/lutron.py
new file mode 100644
index 00000000000..4146ba5a43b
--- /dev/null
+++ b/homeassistant/components/switch/lutron.py
@@ -0,0 +1,49 @@
+"""
+Support for Lutron switches.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/switch.lutron/
+"""
+import logging
+
+from homeassistant.components.switch import SwitchDevice
+from homeassistant.components.lutron import (
+    LutronDevice, LUTRON_DEVICES, LUTRON_CONTROLLER)
+
+_LOGGER = logging.getLogger(__name__)
+
+DEPENDENCIES = ['lutron']
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the Lutron switches."""
+    devs = []
+    for (area_name, device) in hass.data[LUTRON_DEVICES]['switch']:
+        dev = LutronSwitch(area_name, device, hass.data[LUTRON_CONTROLLER])
+        devs.append(dev)
+
+    add_entities(devs, True)
+
+
+class LutronSwitch(LutronDevice, SwitchDevice):
+    """Representation of a Lutron Switch."""
+
+    def turn_on(self, **kwargs):
+        """Turn the switch on."""
+        self._lutron_device.level = 100
+
+    def turn_off(self, **kwargs):
+        """Turn the switch off."""
+        self._lutron_device.level = 0
+
+    @property
+    def device_state_attributes(self):
+        """Return the state attributes."""
+        attr = {}
+        attr['lutron_integration_id'] = self._lutron_device.id
+        return attr
+
+    @property
+    def is_on(self):
+        """Return true if device is on."""
+        return self._lutron_device.last_level() > 0
diff --git a/homeassistant/components/switch/mqtt.py b/homeassistant/components/switch/mqtt.py
index 19e72a9d021..494156ea8de 100644
--- a/homeassistant/components/switch/mqtt.py
+++ b/homeassistant/components/switch/mqtt.py
@@ -169,7 +169,8 @@ class MqttSwitch(MqttAvailability, MqttDiscoveryUpdate, MqttEntityDeviceInfo,
 
     async def async_will_remove_from_hass(self):
         """Unsubscribe when removed."""
-        await subscription.async_unsubscribe_topics(self.hass, self._sub_state)
+        self._sub_state = await subscription.async_unsubscribe_topics(
+            self.hass, self._sub_state)
         await MqttAvailability.async_will_remove_from_hass(self)
 
     @property
diff --git a/homeassistant/components/switch/pencom.py b/homeassistant/components/switch/pencom.py
new file mode 100644
index 00000000000..d2c73d70d96
--- /dev/null
+++ b/homeassistant/components/switch/pencom.py
@@ -0,0 +1,101 @@
+"""Pencom relay control.
+
+For more details about this component, please refer to the documentation at
+http://home-assistant.io/components/switch.pencom
+"""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.switch import SwitchDevice, PLATFORM_SCHEMA
+from homeassistant.const import CONF_HOST, CONF_PORT, CONF_NAME
+from homeassistant.exceptions import PlatformNotReady
+import homeassistant.helpers.config_validation as cv
+
+REQUIREMENTS = ['pencompy==0.0.3']
+
+_LOGGER = logging.getLogger(__name__)
+
+CONF_BOARDS = 'boards'
+CONF_BOARD = 'board'
+CONF_ADDR = 'addr'
+CONF_RELAYS = 'relays'
+
+RELAY_SCHEMA = vol.Schema({
+    vol.Required(CONF_NAME): cv.string,
+    vol.Required(CONF_ADDR): cv.positive_int,
+    vol.Optional(CONF_BOARD, default=0): cv.positive_int,
+})
+
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Required(CONF_HOST): cv.string,
+    vol.Required(CONF_PORT): cv.port,
+    vol.Optional(CONF_BOARDS, default=1): cv.positive_int,
+    vol.Required(CONF_RELAYS): vol.All(cv.ensure_list, [RELAY_SCHEMA]),
+})
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Pencom relay platform (pencompy)."""
+    from pencompy.pencompy import Pencompy
+
+    # Assign configuration variables.
+    host = config[CONF_HOST]
+    port = config[CONF_PORT]
+    boards = config[CONF_BOARDS]
+
+    # Setup connection
+    try:
+        hub = Pencompy(host, port, boards=boards)
+    except OSError as error:
+        _LOGGER.error("Could not connect to pencompy: %s", error)
+        raise PlatformNotReady
+
+    # Add devices.
+    devs = []
+    for relay in config[CONF_RELAYS]:
+        name = relay[CONF_NAME]
+        board = relay[CONF_BOARD]
+        addr = relay[CONF_ADDR]
+        devs.append(PencomRelay(hub, board, addr, name))
+    add_entities(devs, True)
+
+
+class PencomRelay(SwitchDevice):
+    """Representation of a pencom relay."""
+
+    def __init__(self, hub, board, addr, name):
+        """Create a relay."""
+        self._hub = hub
+        self._board = board
+        self._addr = addr
+        self._name = name
+        self._state = None
+
+    @property
+    def name(self):
+        """Relay name."""
+        return self._name
+
+    @property
+    def is_on(self):
+        """Return a relay's state."""
+        return self._state
+
+    def turn_on(self, **kwargs):
+        """Turn a relay on."""
+        self._hub.set(self._board, self._addr, True)
+
+    def turn_off(self, **kwargs):
+        """Turn a relay off."""
+        self._hub.set(self._board, self._addr, False)
+
+    def update(self):
+        """Refresh a relay's state."""
+        self._state = self._hub.get(self._board, self._addr)
+
+    @property
+    def device_state_attributes(self):
+        """Return supported attributes."""
+        return {"board": self._board,
+                "addr": self._addr}
diff --git a/homeassistant/components/switch/raspihats.py b/homeassistant/components/switch/raspihats.py
index c697d7042a6..b422efea2ff 100644
--- a/homeassistant/components/switch/raspihats.py
+++ b/homeassistant/components/switch/raspihats.py
@@ -123,7 +123,7 @@ class I2CHatSwitch(ToggleEntity):
     def turn_on(self, **kwargs):
         """Turn the device on."""
         try:
-            state = True if self._invert_logic is False else False
+            state = self._invert_logic is False
             self.I2C_HATS_MANAGER.write_dq(self._address, self._channel, state)
             self.schedule_update_ha_state()
         except I2CHatsException as ex:
@@ -132,7 +132,7 @@ class I2CHatSwitch(ToggleEntity):
     def turn_off(self, **kwargs):
         """Turn the device off."""
         try:
-            state = False if self._invert_logic is False else True
+            state = self._invert_logic is not False
             self.I2C_HATS_MANAGER.write_dq(self._address, self._channel, state)
             self.schedule_update_ha_state()
         except I2CHatsException as ex:
diff --git a/homeassistant/components/switch/raspyrfm.py b/homeassistant/components/switch/raspyrfm.py
new file mode 100644
index 00000000000..a8a6230fc09
--- /dev/null
+++ b/homeassistant/components/switch/raspyrfm.py
@@ -0,0 +1,137 @@
+"""
+Support for switch devices that can be controlled using the RaspyRFM rc module.
+
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/switch.raspyrfm/
+"""
+import logging
+
+import voluptuous as vol
+
+from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchDevice
+from homeassistant.const import (
+    CONF_HOST, CONF_NAME, CONF_PORT, CONF_SWITCHES,
+    DEVICE_DEFAULT_NAME)
+import homeassistant.helpers.config_validation as cv
+
+REQUIREMENTS = ['raspyrfm-client==1.2.8']
+_LOGGER = logging.getLogger(__name__)
+
+CONF_GATEWAY_MANUFACTURER = 'gateway_manufacturer'
+CONF_GATEWAY_MODEL = 'gateway_model'
+CONF_CONTROLUNIT_MANUFACTURER = 'controlunit_manufacturer'
+CONF_CONTROLUNIT_MODEL = 'controlunit_model'
+CONF_CHANNEL_CONFIG = 'channel_config'
+DEFAULT_HOST = '127.0.0.1'
+
+# define configuration parameters
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
+    vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
+    vol.Optional(CONF_PORT): cv.port,
+    vol.Optional(CONF_GATEWAY_MANUFACTURER): cv.string,
+    vol.Optional(CONF_GATEWAY_MODEL): cv.string,
+    vol.Required(CONF_SWITCHES): vol.Schema([{
+        vol.Optional(CONF_NAME, default=DEVICE_DEFAULT_NAME): cv.string,
+        vol.Required(CONF_CONTROLUNIT_MANUFACTURER): cv.string,
+        vol.Required(CONF_CONTROLUNIT_MODEL): cv.string,
+        vol.Required(CONF_CHANNEL_CONFIG): {cv.string: cv.match_all},
+    }])
+}, extra=vol.ALLOW_EXTRA)
+
+
+def setup_platform(hass, config, add_entities, discovery_info=None):
+    """Set up the RaspyRFM switch."""
+    from raspyrfm_client import RaspyRFMClient
+    from raspyrfm_client.device_implementations.controlunit. \
+        controlunit_constants import ControlUnitModel
+    from raspyrfm_client.device_implementations.gateway.manufacturer. \
+        gateway_constants import GatewayModel
+    from raspyrfm_client.device_implementations.manufacturer_constants \
+        import Manufacturer
+
+    gateway_manufacturer = config.get(CONF_GATEWAY_MANUFACTURER,
+                                      Manufacturer.SEEGEL_SYSTEME.value)
+    gateway_model = config.get(CONF_GATEWAY_MODEL, GatewayModel.RASPYRFM.value)
+    host = config[CONF_HOST]
+    port = config.get(CONF_PORT)
+    switches = config[CONF_SWITCHES]
+
+    raspyrfm_client = RaspyRFMClient()
+    gateway = raspyrfm_client.get_gateway(Manufacturer(gateway_manufacturer),
+                                          GatewayModel(gateway_model), host,
+                                          port)
+    switch_entities = []
+    for switch in switches:
+        name = switch[CONF_NAME]
+        controlunit_manufacturer = switch[CONF_CONTROLUNIT_MANUFACTURER]
+        controlunit_model = switch[CONF_CONTROLUNIT_MODEL]
+        channel_config = switch[CONF_CHANNEL_CONFIG]
+
+        controlunit = raspyrfm_client.get_controlunit(
+            Manufacturer(controlunit_manufacturer),
+            ControlUnitModel(controlunit_model))
+
+        controlunit.set_channel_config(**channel_config)
+
+        switch = RaspyRFMSwitch(raspyrfm_client, name, gateway, controlunit)
+        switch_entities.append(switch)
+
+    add_entities(switch_entities)
+
+
+class RaspyRFMSwitch(SwitchDevice):
+    """Representation of a RaspyRFM switch."""
+
+    def __init__(self, raspyrfm_client, name: str, gateway, controlunit):
+        """Initialize the switch."""
+        self._raspyrfm_client = raspyrfm_client
+
+        self._name = name
+        self._gateway = gateway
+        self._controlunit = controlunit
+
+        self._state = None
+
+    @property
+    def name(self):
+        """Return the name of the device if any."""
+        return self._name
+
+    @property
+    def should_poll(self):
+        """Return True if polling should be used."""
+        return False
+
+    @property
+    def assumed_state(self):
+        """Return True when the current state can not be queried."""
+        return True
+
+    @property
+    def is_on(self):
+        """Return true if switch is on."""
+        return self._state
+
+    def turn_on(self, **kwargs):
+        """Turn the switch on."""
+        from raspyrfm_client.device_implementations.controlunit.actions \
+            import Action
+
+        self._raspyrfm_client.send(self._gateway, self._controlunit, Action.ON)
+        self._state = True
+        self.schedule_update_ha_state()
+
+    def turn_off(self, **kwargs):
+        """Turn the switch off."""
+        from raspyrfm_client.device_implementations.controlunit.actions \
+            import Action
+
+        if Action.OFF in self._controlunit.get_supported_actions():
+            self._raspyrfm_client.send(
+                self._gateway, self._controlunit, Action.OFF)
+        else:
+            self._raspyrfm_client.send(
+                self._gateway, self._controlunit, Action.ON)
+
+        self._state = False
+        self.schedule_update_ha_state()
diff --git a/homeassistant/components/switch/rflink.py b/homeassistant/components/switch/rflink.py
index 51bf5543584..25e4e367fdf 100644
--- a/homeassistant/components/switch/rflink.py
+++ b/homeassistant/components/switch/rflink.py
@@ -67,6 +67,7 @@ async def async_setup_platform(hass, config, async_add_entities,
     async_add_entities(devices_from_config(config))
 
 
+# pylint: disable=too-many-ancestors
 class RflinkSwitch(SwitchableRflinkDevice, SwitchDevice):
     """Representation of a Rflink switch."""
 
diff --git a/homeassistant/components/switch/rpi_rf.py b/homeassistant/components/switch/rpi_rf.py
index ffadc0d38de..e7f14685eb2 100644
--- a/homeassistant/components/switch/rpi_rf.py
+++ b/homeassistant/components/switch/rpi_rf.py
@@ -13,7 +13,7 @@ from homeassistant.const import (
     CONF_NAME, CONF_SWITCHES, EVENT_HOMEASSISTANT_STOP)
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['rpi-rf==0.9.6']
+REQUIREMENTS = ['rpi-rf==0.9.7']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/switch/switchbot.py b/homeassistant/components/switch/switchbot.py
index 9682a4444aa..9cd2927d832 100644
--- a/homeassistant/components/switch/switchbot.py
+++ b/homeassistant/components/switch/switchbot.py
@@ -12,7 +12,7 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.components.switch import SwitchDevice, PLATFORM_SCHEMA
 from homeassistant.const import CONF_NAME, CONF_MAC
 
-REQUIREMENTS = ['PySwitchbot==0.4']
+REQUIREMENTS = ['PySwitchbot==0.5']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/switch/tellduslive.py b/homeassistant/components/switch/tellduslive.py
index ed4f825f5ac..5c04e872623 100644
--- a/homeassistant/components/switch/tellduslive.py
+++ b/homeassistant/components/switch/tellduslive.py
@@ -9,20 +9,36 @@ https://home-assistant.io/components/switch.tellduslive/
 """
 import logging
 
-from homeassistant.components import tellduslive
+from homeassistant.components import switch, tellduslive
 from homeassistant.components.tellduslive.entry import TelldusLiveEntity
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import ToggleEntity
 
 _LOGGER = logging.getLogger(__name__)
 
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
-    """Set up Tellstick switches."""
-    if discovery_info is None:
-        return
-    client = hass.data[tellduslive.DOMAIN]
-    add_entities(
-        TelldusLiveSwitch(client, switch) for switch in discovery_info)
+    """Old way of setting up TelldusLive.
+
+    Can only be called when a user accidentally mentions the platform in their
+    config. But even in that case it would have been ignored.
+    """
+    pass
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up tellduslive sensors dynamically."""
+    async def async_discover_switch(device_id):
+        """Discover and add a discovered sensor."""
+        client = hass.data[tellduslive.DOMAIN]
+        async_add_entities([TelldusLiveSwitch(client, device_id)])
+
+    async_dispatcher_connect(
+        hass,
+        tellduslive.TELLDUS_DISCOVERY_NEW.format(switch.DOMAIN,
+                                                 tellduslive.DOMAIN),
+        async_discover_switch,
+    )
 
 
 class TelldusLiveSwitch(TelldusLiveEntity, ToggleEntity):
diff --git a/homeassistant/components/switch/wemo.py b/homeassistant/components/switch/wemo.py
index 94b86377b8d..0815f307a9a 100644
--- a/homeassistant/components/switch/wemo.py
+++ b/homeassistant/components/switch/wemo.py
@@ -35,7 +35,7 @@ WEMO_OFF = 0
 WEMO_STANDBY = 8
 
 
-def setup_platform(hass, config, add_entities_callback, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up discovered WeMo switches."""
     from pywemo import discovery
 
@@ -51,7 +51,7 @@ def setup_platform(hass, config, add_entities_callback, discovery_info=None):
             raise PlatformNotReady
 
         if device:
-            add_entities_callback([WemoSwitch(device)])
+            add_entities([WemoSwitch(device)])
 
 
 class WemoSwitch(SwitchDevice):
@@ -64,10 +64,12 @@ class WemoSwitch(SwitchDevice):
         self.maker_params = None
         self.coffeemaker_mode = None
         self._state = None
+        self._mode_string = None
         self._available = True
         self._update_lock = None
-        # look up model name once as it incurs network traffic
         self._model_name = self.wemo.model_name
+        self._name = self.wemo.name
+        self._serialnumber = self.wemo.serialnumber
 
     def _subscription_callback(self, _device, _type, _params):
         """Update the state by the Wemo device."""
@@ -85,24 +87,15 @@ class WemoSwitch(SwitchDevice):
         await self._async_locked_update(force_update)
         self.async_schedule_update_ha_state()
 
-    @property
-    def should_poll(self):
-        """Device should poll.
-
-        Subscriptions push the state, however it won't detect if a device
-        is no longer available. Use polling to detect if a device is available.
-        """
-        return True
-
     @property
     def unique_id(self):
         """Return the ID of this WeMo switch."""
-        return self.wemo.serialnumber
+        return self._serialnumber
 
     @property
     def name(self):
         """Return the name of the switch if any."""
-        return self.wemo.name
+        return self._name
 
     @property
     def device_state_attributes(self):
@@ -169,7 +162,7 @@ class WemoSwitch(SwitchDevice):
     def detail_state(self):
         """Return the state of the device."""
         if self.coffeemaker_mode is not None:
-            return self.wemo.mode_string
+            return self._mode_string
         if self.insight_params:
             standby_state = int(self.insight_params['state'])
             if standby_state == WEMO_ON:
@@ -242,6 +235,7 @@ class WemoSwitch(SwitchDevice):
         """Update the device state."""
         try:
             self._state = self.wemo.get_state(force_update)
+
             if self._model_name == 'Insight':
                 self.insight_params = self.wemo.insight_params
                 self.insight_params['standby_state'] = (
@@ -250,6 +244,7 @@ class WemoSwitch(SwitchDevice):
                 self.maker_params = self.wemo.maker_params
             elif self._model_name == 'CoffeeMaker':
                 self.coffeemaker_mode = self.wemo.mode
+                self._mode_string = self.wemo.mode_string
 
             if not self._available:
                 _LOGGER.info('Reconnected to %s', self.name)
diff --git a/homeassistant/components/switch/xiaomi_miio.py b/homeassistant/components/switch/xiaomi_miio.py
index 125f89f5040..9db13446752 100644
--- a/homeassistant/components/switch/xiaomi_miio.py
+++ b/homeassistant/components/switch/xiaomi_miio.py
@@ -39,6 +39,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
          'chuangmi.plug.m1',
          'chuangmi.plug.v2',
          'chuangmi.plug.v3',
+         'chuangmi.plug.hmi205',
          ]),
 })
 
@@ -146,7 +147,8 @@ async def async_setup_platform(hass, config, async_add_entities,
         device = XiaomiPowerStripSwitch(name, plug, model, unique_id)
         devices.append(device)
         hass.data[DATA_KEY][host] = device
-    elif model in ['chuangmi.plug.m1', 'chuangmi.plug.v2']:
+    elif model in ['chuangmi.plug.m1', 'chuangmi.plug.v2',
+                   'chuangmi.plug.hmi205']:
         from miio import ChuangmiPlug
         plug = ChuangmiPlug(host, token, model=model)
         device = XiaomiPlugGenericSwitch(name, plug, model, unique_id)
diff --git a/homeassistant/components/switch/zha.py b/homeassistant/components/switch/zha.py
index 4dac3bfbb22..0e1080664be 100644
--- a/homeassistant/components/switch/zha.py
+++ b/homeassistant/components/switch/zha.py
@@ -9,7 +9,7 @@ import logging
 from homeassistant.components.switch import DOMAIN, SwitchDevice
 from homeassistant.components.zha import helpers
 from homeassistant.components.zha.const import (
-    DATA_ZHA, DATA_ZHA_DISPATCHERS, ZHA_DISCOVERY_NEW)
+    DATA_ZHA, DATA_ZHA_DISPATCHERS, REPORT_CONFIG_IMMEDIATE, ZHA_DISCOVERY_NEW)
 from homeassistant.components.zha.entities import ZhaEntity
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
@@ -44,18 +44,9 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 async def _async_setup_entities(hass, config_entry, async_add_entities,
                                 discovery_infos):
     """Set up the ZHA switches."""
-    from zigpy.zcl.clusters.general import OnOff
     entities = []
     for discovery_info in discovery_infos:
-        switch = Switch(**discovery_info)
-        if discovery_info['new_join']:
-            in_clusters = discovery_info['in_clusters']
-            cluster = in_clusters[OnOff.cluster_id]
-            await helpers.configure_reporting(
-                switch.entity_id, cluster, switch.value_attribute,
-                min_report=0, max_report=600, reportable_change=1
-            )
-        entities.append(switch)
+        entities.append(Switch(**discovery_info))
 
     async_add_entities(entities, update_before_add=True)
 
@@ -77,9 +68,16 @@ class Switch(ZhaEntity, SwitchDevice):
             self.async_schedule_update_ha_state()
 
     @property
-    def should_poll(self) -> bool:
-        """Let zha handle polling."""
-        return False
+    def zcl_reporting_config(self) -> dict:
+        """Retrun a dict of attribute reporting configuration."""
+        return {
+            self.cluster: {'on_off': REPORT_CONFIG_IMMEDIATE}
+        }
+
+    @property
+    def cluster(self):
+        """Entity's cluster."""
+        return self._endpoint.on_off
 
     @property
     def is_on(self) -> bool:
@@ -118,7 +116,7 @@ class Switch(ZhaEntity, SwitchDevice):
 
     async def async_update(self):
         """Retrieve latest state."""
-        result = await helpers.safe_read(self._endpoint.on_off,
+        result = await helpers.safe_read(self.cluster,
                                          ['on_off'],
                                          allow_cache=False,
                                          only_cache=(not self._initialized))
diff --git a/homeassistant/components/tahoma.py b/homeassistant/components/tahoma.py
index 645d67b3dc2..ff9e30e5c68 100644
--- a/homeassistant/components/tahoma.py
+++ b/homeassistant/components/tahoma.py
@@ -39,6 +39,7 @@ TAHOMA_TYPES = {
     'io:ExteriorVenetianBlindIOComponent': 'cover',
     'io:HorizontalAwningIOComponent': 'cover',
     'io:LightIOSystemSensor': 'sensor',
+    'io:OnOffIOComponent': 'switch',
     'io:OnOffLightIOComponent': 'switch',
     'io:RollerShutterGenericIOComponent': 'cover',
     'io:RollerShutterUnoIOComponent': 'cover',
diff --git a/homeassistant/components/tellduslive/.translations/ca.json b/homeassistant/components/tellduslive/.translations/ca.json
new file mode 100644
index 00000000000..db97b1ad6d8
--- /dev/null
+++ b/homeassistant/components/tellduslive/.translations/ca.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "all_configured": "TelldusLive ja est\u00e0 configurat",
+            "authorize_url_fail": "S'ha produ\u00eft un error desconegut al generar l'URL d'autoritzaci\u00f3.",
+            "authorize_url_timeout": "S'ha acabat el temps d'espera mentre \u00e9s generava l'URL d'autoritzaci\u00f3.",
+            "unknown": "S'ha produ\u00eft un error desconegut"
+        },
+        "step": {
+            "auth": {
+                "description": "Passos per enlla\u00e7ar el teu compte de TelldusLive:\n 1. Clica l'enlla\u00e7 de sota.\n 2. Inicia sessi\u00f3 a Telldus Live.\n 3. Autoritza **{app_name}** (clica **Yes**).\n 4. Torna aqu\u00ed i clica **SUBMIT**.\n \n [Enlla\u00e7 al compte de TelldusLive]({auth_url})",
+                "title": "Autenticaci\u00f3 amb TelldusLive"
+            },
+            "user": {
+                "data": {
+                    "host": "Amfitri\u00f3"
+                },
+                "title": "Selecci\u00f3 extrem"
+            }
+        },
+        "title": "Telldus Live"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tellduslive/.translations/en.json b/homeassistant/components/tellduslive/.translations/en.json
new file mode 100644
index 00000000000..3a72b41e1f7
--- /dev/null
+++ b/homeassistant/components/tellduslive/.translations/en.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "all_configured": "TelldusLive is already configured",
+            "authorize_url_fail": "Unknown error generating an authorize url.",
+            "authorize_url_timeout": "Timeout generating authorize url.",
+            "unknown": "Unknown error occurred"
+        },
+        "step": {
+            "auth": {
+                "description": "To link your TelldusLive account:\n 1. Click the link below\n 2. Login to Telldus Live\n 3. Authorize **{app_name}** (click **Yes**).\n 4. Come back here and click **SUBMIT**.\n\n [Link TelldusLive account]({auth_url})",
+                "title": "Authenticate against TelldusLive"
+            },
+            "user": {
+                "data": {
+                    "host": "Host"
+                },
+                "title": "Pick endpoint."
+            }
+        },
+        "title": "Telldus Live"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tellduslive/.translations/hu.json b/homeassistant/components/tellduslive/.translations/hu.json
new file mode 100644
index 00000000000..90ac7396f47
--- /dev/null
+++ b/homeassistant/components/tellduslive/.translations/hu.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "unknown": "Ismeretlen hiba t\u00f6rt\u00e9nt"
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tellduslive/.translations/ko.json b/homeassistant/components/tellduslive/.translations/ko.json
new file mode 100644
index 00000000000..a7b68bbf8be
--- /dev/null
+++ b/homeassistant/components/tellduslive/.translations/ko.json
@@ -0,0 +1,24 @@
+{
+    "config": {
+        "abort": {
+            "all_configured": "TelldusLive \uac00 \uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4",
+            "authorize_url_fail": "\uc778\uc99d url \uc0dd\uc131\uc5d0 \uc54c \uc218 \uc5c6\ub294 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.",
+            "authorize_url_timeout": "\uc778\uc99d url \uc0dd\uc131 \uc2dc\uac04\uc774 \ucd08\uacfc\ub418\uc5c8\uc2b5\ub2c8\ub2e4.",
+            "unknown": "\uc54c \uc218\uc5c6\ub294 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4"
+        },
+        "step": {
+            "auth": {
+                "description": "TelldusLive \uacc4\uc815\uc744 \uc5f0\uacb0\ud558\ub824\uba74:\n 1. \ud558\ub2e8\uc758 \ub9c1\ud06c\ub97c \ud074\ub9ad\ud574\uc8fc\uc138\uc694\n 2. Telldus Live \uc5d0 \ub85c\uadf8\uc778 \ud558\uc138\uc694\n 3. Authorize **{app_name}** (**Yes** \ub97c \ud074\ub9ad\ud558\uc138\uc694).\n 4. \ub2e4\uc2dc \uc5ec\uae30\ub85c \ub3cc\uc544\uc640\uc11c **SUBMIT** \uc744 \ud074\ub9ad\ud558\uc138\uc694.\n\n [TelldusLive \uacc4\uc815 \uc5f0\uacb0\ud558\uae30]({auth_url})",
+                "title": "TelldusLive \uc5d0 \ub300\ud55c \uc778\uc99d"
+            },
+            "user": {
+                "data": {
+                    "host": "\ud638\uc2a4\ud2b8"
+                },
+                "description": "\uc8c4\uc1a1\ud569\ub2c8\ub2e4. \uad00\ub828 \ub0b4\uc6a9\uc774 \uc544\uc9c1 \uc5c5\ub370\uc774\ud2b8 \ub418\uc9c0 \uc54a\uc558\uc2b5\ub2c8\ub2e4. \ucd94\ud6c4\uc5d0 \ubc18\uc601\ub420 \uc608\uc815\uc774\ub2c8 \uc870\uae08\ub9cc \uae30\ub2e4\ub824\uc8fc\uc138\uc694.",
+                "title": "\uc5d4\ub4dc \ud3ec\uc778\ud2b8\ub97c \uc120\ud0dd\ud574\uc8fc\uc138\uc694."
+            }
+        },
+        "title": "Telldus Live"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tellduslive/.translations/lb.json b/homeassistant/components/tellduslive/.translations/lb.json
new file mode 100644
index 00000000000..85de49776c1
--- /dev/null
+++ b/homeassistant/components/tellduslive/.translations/lb.json
@@ -0,0 +1,24 @@
+{
+    "config": {
+        "abort": {
+            "all_configured": "TelldusLive ass scho konfigur\u00e9iert",
+            "authorize_url_fail": "Onbekannte Feeler beim gener\u00e9ieren vun der Autorisatiouns URL.",
+            "authorize_url_timeout": "Z\u00e4it Iwwerschreidung beim gener\u00e9ieren vun der Autorisatiouns URL.",
+            "unknown": "Onbekannten Fehler opgetrueden"
+        },
+        "step": {
+            "auth": {
+                "description": "Fir den TelldusLive Kont ze verbannen:\n1. Klickt op de Link \u00ebnnen\n2. Verbannt iech mat TelldusLive\n3. Autoris\u00e9iert **{app_name}** (klickt **Yes**)\n4. Kommt heihinner zer\u00e9ck a klickt **Ofsch\u00e9cken**\n\n[Tellduslive Kont verbannen]({auth_url})",
+                "title": "Mat TelldusLive authentifiz\u00e9ieren"
+            },
+            "user": {
+                "data": {
+                    "host": "Apparat"
+                },
+                "description": "Eidel",
+                "title": "Endpoint auswielen"
+            }
+        },
+        "title": "Telldus Live"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tellduslive/.translations/no.json b/homeassistant/components/tellduslive/.translations/no.json
new file mode 100644
index 00000000000..5c3d343dd03
--- /dev/null
+++ b/homeassistant/components/tellduslive/.translations/no.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "all_configured": "TelldusLive er allerede konfigurert",
+            "authorize_url_fail": "Ukjent feil ved generering av autoriseringsadresse.",
+            "authorize_url_timeout": "Tidsavbrudd ved generering av autoriseringsadresse.",
+            "unknown": "Ukjent feil oppstod"
+        },
+        "step": {
+            "auth": {
+                "description": "For \u00e5 koble TelldusLive-kontoen din:\n 1. Klikk p\u00e5 linken under\n 2. Logg inn p\u00e5 Telldus Live \n 3. Tillat **{app_name}** (klikk**Ja**). \n 4. Kom tilbake hit og klikk **SUBMIT**. \n\n [Link TelldusLive-konto]({auth_url})",
+                "title": "Godkjen mot TelldusLive"
+            },
+            "user": {
+                "data": {
+                    "host": "Vert"
+                },
+                "title": "Velg endepunkt."
+            }
+        },
+        "title": "Telldus Live"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tellduslive/.translations/pl.json b/homeassistant/components/tellduslive/.translations/pl.json
new file mode 100644
index 00000000000..63080a78632
--- /dev/null
+++ b/homeassistant/components/tellduslive/.translations/pl.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "all_configured": "TelldusLive jest ju\u017c skonfigurowany",
+            "authorize_url_fail": "Nieznany b\u0142\u0105d podczas generowania url autoryzacji.",
+            "authorize_url_timeout": "Min\u0105\u0142 limit czasu generowania url autoryzacji.",
+            "unknown": "Wyst\u0105pi\u0142 nieznany b\u0142\u0105d"
+        },
+        "step": {
+            "auth": {
+                "description": "Aby po\u0142\u0105czy\u0107 konto TelldusLive: \n 1. Kliknij poni\u017cszy link \n 2. Zaloguj si\u0119 do Telldus Live \n 3. Autoryzuj **{app_name}** (kliknij **Tak**). \n 4. Wr\u00f3\u0107 tutaj i kliknij **SUBMIT**. \n\n [Link do konta TelldusLive]({auth_url})",
+                "title": "Uwierzytelnienie  na TelldusLive"
+            },
+            "user": {
+                "data": {
+                    "host": "Host"
+                },
+                "title": "Wybierz punkt ko\u0144cowy."
+            }
+        },
+        "title": "Telldus Live"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tellduslive/.translations/ru.json b/homeassistant/components/tellduslive/.translations/ru.json
new file mode 100644
index 00000000000..2e319b9400b
--- /dev/null
+++ b/homeassistant/components/tellduslive/.translations/ru.json
@@ -0,0 +1,23 @@
+{
+    "config": {
+        "abort": {
+            "all_configured": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430 \u0443\u0436\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430.",
+            "authorize_url_fail": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
+            "authorize_url_timeout": "\u0418\u0441\u0442\u0435\u043a\u043b\u043e \u0432\u0440\u0435\u043c\u044f \u0433\u0435\u043d\u0435\u0440\u0430\u0446\u0438\u0438 \u0441\u0441\u044b\u043b\u043a\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u0438.",
+            "unknown": "\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430"
+        },
+        "step": {
+            "auth": {
+                "description": "\u0414\u043b\u044f \u0442\u043e\u0433\u043e, \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u0438\u0432\u044f\u0437\u0430\u0442\u044c \u0430\u043a\u043a\u0430\u0443\u043d\u0442 TelldusLive:\n 1. \u041f\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u043f\u043e \u0441\u0441\u044b\u043b\u043a\u0435, \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0439 \u043d\u0438\u0436\u0435\n 2. \u0412\u043e\u0439\u0434\u0438\u0442\u0435 \u0432 Telldus Live\n 3. Authorize **{app_name}** (\u043d\u0430\u0436\u043c\u0438\u0442\u0435 **Yes**).\n 4. \u0412\u0435\u0440\u043d\u0438\u0442\u0435\u0441\u044c \u0441\u044e\u0434\u0430 \u0438 \u043d\u0430\u0436\u043c\u0438\u0442\u0435 **\u041f\u041e\u0414\u0422\u0412\u0415\u0420\u0414\u0418\u0422\u042c**.\n\n [\u0421\u0441\u044b\u043b\u043a\u0430 \u043d\u0430 TelldusLive]({auth_url})",
+                "title": "\u0412\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0432\u0445\u043e\u0434 \u0432 TelldusLive"
+            },
+            "user": {
+                "data": {
+                    "host": "\u0425\u043e\u0441\u0442"
+                },
+                "title": "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u043e\u043d\u0435\u0447\u043d\u0443\u044e \u0442\u043e\u0447\u043a\u0443."
+            }
+        },
+        "title": "Telldus Live"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tellduslive/.translations/sl.json b/homeassistant/components/tellduslive/.translations/sl.json
new file mode 100644
index 00000000000..f4b9f0fda98
--- /dev/null
+++ b/homeassistant/components/tellduslive/.translations/sl.json
@@ -0,0 +1,24 @@
+{
+    "config": {
+        "abort": {
+            "all_configured": "TelldusLive je \u017ee konfiguriran",
+            "authorize_url_fail": "Neznana napaka pri generiranju potrditvenega URL-ja.",
+            "authorize_url_timeout": "\u010casovna omejitev za generiranje URL-ja je potekla.",
+            "unknown": "Pri\u0161lo je do neznane napake"
+        },
+        "step": {
+            "auth": {
+                "description": "\u010ce \u017eelite povezati svoj ra\u010dun TelldusLive: \n 1. Kliknite spodnjo povezavo \n 2. Prijavite se v Telldus Live \n 3. Dovolite ** {app_name} ** (kliknite ** Da **). \n 4. Pridi nazaj in kliknite ** SUBMIT **. \n\n [Link TelldusLive ra\u010dun] ( {auth_url} )",
+                "title": "Preverjanje pristnosti za TelldusLive"
+            },
+            "user": {
+                "data": {
+                    "host": "Gostitelj"
+                },
+                "description": "Prazno",
+                "title": "Izberite kon\u010dno to\u010dko."
+            }
+        },
+        "title": "Telldus Live"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tellduslive/.translations/zh-Hant.json b/homeassistant/components/tellduslive/.translations/zh-Hant.json
new file mode 100644
index 00000000000..a5e3c652c0c
--- /dev/null
+++ b/homeassistant/components/tellduslive/.translations/zh-Hant.json
@@ -0,0 +1,24 @@
+{
+    "config": {
+        "abort": {
+            "all_configured": "TelldusLive \u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210",
+            "authorize_url_fail": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u767c\u751f\u672a\u77e5\u932f\u8aa4",
+            "authorize_url_timeout": "\u7522\u751f\u8a8d\u8b49 URL \u6642\u903e\u6642",
+            "unknown": "\u767c\u751f\u672a\u77e5\u932f\u8aa4\u3002"
+        },
+        "step": {
+            "auth": {
+                "description": "\u6b32\u9023\u7d50 TelldusLive \u5e33\u865f\uff1a\n 1. \u9ede\u9078\u4e0b\u65b9\u9023\u7d50\n 2. \u767b\u5165\u81f3 Telldus Live\n 3. \u5c0d **{app_name}** \u9032\u884c\u6388\u6b0a\uff08\u9ede\u9078 **Yes**\uff09\u3002\n 4. \u56de\u5230\u672c\u9801\u9762\u4e26\u9ede\u9078 **\u50b3\u9001**\u3002\n\n [Link TelldusLive account]({auth_url})",
+                "title": "TelldusLive \u8a8d\u8b49"
+            },
+            "user": {
+                "data": {
+                    "host": "\u4e3b\u6a5f\u7aef"
+                },
+                "description": "\u7a7a\u767d",
+                "title": "\u9078\u64c7 endpoint\u3002"
+            }
+        },
+        "title": "Telldus Live"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/tellduslive/__init__.py b/homeassistant/components/tellduslive/__init__.py
index 89e74464489..472ba3d36f3 100644
--- a/homeassistant/components/tellduslive/__init__.py
+++ b/homeassistant/components/tellduslive/__init__.py
@@ -4,250 +4,206 @@ Support for Telldus Live.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/tellduslive/
 """
+import asyncio
 from datetime import timedelta
+from functools import partial
 import logging
 
 import voluptuous as vol
 
-from homeassistant.components.discovery import SERVICE_TELLDUSLIVE
-from homeassistant.const import CONF_HOST, CONF_TOKEN
-from homeassistant.helpers import discovery
+from homeassistant import config_entries
 import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.dispatcher import dispatcher_send
-from homeassistant.helpers.event import track_time_interval
-from homeassistant.util.json import load_json, save_json
+from homeassistant.helpers.dispatcher import async_dispatcher_send
+from homeassistant.helpers.event import async_track_time_interval
 
-from .const import DOMAIN, SIGNAL_UPDATE_ENTITY
+from . import config_flow  # noqa  pylint_disable=unused-import
+from .const import (
+    CONF_HOST, CONF_UPDATE_INTERVAL, DOMAIN, KEY_HOST, KEY_SCAN_INTERVAL,
+    KEY_SESSION, MIN_UPDATE_INTERVAL, NOT_SO_PRIVATE_KEY, PUBLIC_KEY,
+    SCAN_INTERVAL, SIGNAL_UPDATE_ENTITY, TELLDUS_DISCOVERY_NEW)
 
 APPLICATION_NAME = 'Home Assistant'
 
-REQUIREMENTS = ['tellduslive==0.10.4']
+REQUIREMENTS = ['tellduslive==0.10.8']
 
 _LOGGER = logging.getLogger(__name__)
 
-TELLLDUS_CONFIG_FILE = 'tellduslive.conf'
-KEY_CONFIG = 'tellduslive_config'
+CONFIG_SCHEMA = vol.Schema(
+    {
+        DOMAIN:
+        vol.Schema({
+            vol.Optional(CONF_HOST, default=DOMAIN):
+            cv.string,
+            vol.Optional(CONF_UPDATE_INTERVAL, default=SCAN_INTERVAL):
+            (vol.All(cv.time_period, vol.Clamp(min=MIN_UPDATE_INTERVAL)))
+        }),
+    },
+    extra=vol.ALLOW_EXTRA,
+)
 
-CONF_TOKEN_SECRET = 'token_secret'
-CONF_UPDATE_INTERVAL = 'update_interval'
+DATA_CONFIG_ENTRY_LOCK = 'tellduslive_config_entry_lock'
+CONFIG_ENTRY_IS_SETUP = 'telldus_config_entry_is_setup'
 
-PUBLIC_KEY = 'THUPUNECH5YEQA3RE6UYUPRUZ2DUGUGA'
-NOT_SO_PRIVATE_KEY = 'PHES7U2RADREWAFEBUSTUBAWRASWUTUS'
-
-MIN_UPDATE_INTERVAL = timedelta(seconds=5)
-DEFAULT_UPDATE_INTERVAL = timedelta(minutes=1)
-
-CONFIG_SCHEMA = vol.Schema({
-    DOMAIN: vol.Schema({
-        vol.Optional(CONF_HOST): cv.string,
-        vol.Optional(CONF_UPDATE_INTERVAL, default=DEFAULT_UPDATE_INTERVAL): (
-            vol.All(cv.time_period, vol.Clamp(min=MIN_UPDATE_INTERVAL)))
-    }),
-}, extra=vol.ALLOW_EXTRA)
-
-CONFIG_INSTRUCTIONS = """
-To link your TelldusLive account:
-
-1. Click the link below
-
-2. Login to Telldus Live
-
-3. Authorize {app_name}.
-
-4. Click the Confirm button.
-
-[Link TelldusLive account]({auth_url})
-"""
+INTERVAL_TRACKER = '{}_INTERVAL'.format(DOMAIN)
 
 
-def setup(hass, config, session=None):
-    """Set up the Telldus Live component."""
-    from tellduslive import Session, supports_local_api
-    config_filename = hass.config.path(TELLLDUS_CONFIG_FILE)
-    conf = load_json(config_filename)
+async def async_setup_entry(hass, entry):
+    """Create a tellduslive session."""
+    from tellduslive import Session
+    conf = entry.data[KEY_SESSION]
 
-    def request_configuration(host=None):
-        """Request TelldusLive authorization."""
-        configurator = hass.components.configurator
-        hass.data.setdefault(KEY_CONFIG, {})
-        data_key = host or DOMAIN
-
-        # Configuration already in progress
-        if hass.data[KEY_CONFIG].get(data_key):
-            return
-
-        _LOGGER.info('Configuring TelldusLive %s',
-                     'local client: {}'.format(host) if host else
-                     'cloud service')
-
-        session = Session(public_key=PUBLIC_KEY,
-                          private_key=NOT_SO_PRIVATE_KEY,
-                          host=host,
-                          application=APPLICATION_NAME)
-
-        auth_url = session.authorize_url
-        if not auth_url:
-            _LOGGER.warning('Failed to retrieve authorization URL')
-            return
-
-        _LOGGER.debug('Got authorization URL %s', auth_url)
-
-        def configuration_callback(callback_data):
-            """Handle the submitted configuration."""
-            session.authorize()
-            res = setup(hass, config, session)
-            if not res:
-                configurator.notify_errors(
-                    hass.data[KEY_CONFIG].get(data_key),
-                    'Unable to connect.')
-                return
-
-            conf.update(
-                {host: {CONF_HOST: host,
-                        CONF_TOKEN: session.access_token}} if host else
-                {DOMAIN: {CONF_TOKEN: session.access_token,
-                          CONF_TOKEN_SECRET: session.access_token_secret}})
-            save_json(config_filename, conf)
-            # Close all open configurators: for now, we only support one
-            # tellstick device, and configuration via either cloud service
-            # or via local API, not both at the same time
-            for instance in hass.data[KEY_CONFIG].values():
-                configurator.request_done(instance)
-
-        hass.data[KEY_CONFIG][data_key] = \
-            configurator.request_config(
-                'TelldusLive ({})'.format(
-                    'LocalAPI' if host
-                    else 'Cloud service'),
-                configuration_callback,
-                description=CONFIG_INSTRUCTIONS.format(
-                    app_name=APPLICATION_NAME,
-                    auth_url=auth_url),
-                submit_caption='Confirm',
-                entity_picture='/static/images/logo_tellduslive.png',
-            )
-
-    def tellstick_discovered(service, info):
-        """Run when a Tellstick is discovered."""
-        _LOGGER.info('Discovered tellstick device')
-
-        if DOMAIN in hass.data:
-            _LOGGER.debug('Tellstick already configured')
-            return
-
-        host, device = info[:2]
-
-        if not supports_local_api(device):
-            _LOGGER.debug('Tellstick does not support local API')
-            # Configure the cloud service
-            hass.add_job(request_configuration)
-            return
-
-        _LOGGER.debug('Tellstick does support local API')
-
-        # Ignore any known devices
-        if conf and host in conf:
-            _LOGGER.debug('Discovered already known device: %s', host)
-            return
-
-        # Offer configuration of both live and local API
-        request_configuration()
-        request_configuration(host)
-
-    discovery.listen(hass, SERVICE_TELLDUSLIVE, tellstick_discovered)
-
-    if session:
-        _LOGGER.debug('Continuing setup configured by configurator')
-    elif conf and CONF_HOST in next(iter(conf.values())):
-        #  For now, only one local device is supported
-        _LOGGER.debug('Using Local API pre-configured by configurator')
-        session = Session(**next(iter(conf.values())))
-    elif DOMAIN in conf:
-        _LOGGER.debug('Using TelldusLive cloud service '
-                      'pre-configured by configurator')
-        session = Session(PUBLIC_KEY, NOT_SO_PRIVATE_KEY,
-                          application=APPLICATION_NAME, **conf[DOMAIN])
-    elif config.get(DOMAIN):
-        _LOGGER.info('Found entry in configuration.yaml. '
-                     'Requesting TelldusLive cloud service configuration')
-        request_configuration()
-
-        if CONF_HOST in config.get(DOMAIN, {}):
-            _LOGGER.info('Found TelldusLive host entry in configuration.yaml. '
-                         'Requesting Telldus Local API configuration')
-            request_configuration(config.get(DOMAIN).get(CONF_HOST))
-
-        return True
+    if KEY_HOST in conf:
+        # Session(**conf) does blocking IO when
+        # communicating with local devices.
+        session = await hass.async_add_executor_job(partial(Session, **conf))
     else:
-        _LOGGER.info('Tellstick discovered, awaiting discovery callback')
-        return True
+        session = Session(
+            PUBLIC_KEY,
+            NOT_SO_PRIVATE_KEY,
+            application=APPLICATION_NAME,
+            **conf,
+        )
 
     if not session.is_authorized:
         _LOGGER.error('Authentication Error')
         return False
 
-    client = TelldusLiveClient(hass, config, session)
+    hass.data[DATA_CONFIG_ENTRY_LOCK] = asyncio.Lock()
+    hass.data[CONFIG_ENTRY_IS_SETUP] = set()
+
+    client = TelldusLiveClient(hass, entry, session)
     hass.data[DOMAIN] = client
-    client.update()
+    await async_add_hubs(hass, client, entry.entry_id)
+    hass.async_create_task(client.update())
 
-    interval = config.get(DOMAIN, {}).get(CONF_UPDATE_INTERVAL,
-                                          DEFAULT_UPDATE_INTERVAL)
+    interval = timedelta(seconds=entry.data[KEY_SCAN_INTERVAL])
     _LOGGER.debug('Update interval %s', interval)
-    track_time_interval(hass, client.update, interval)
+    hass.data[INTERVAL_TRACKER] = async_track_time_interval(
+        hass, client.update, interval)
 
     return True
 
 
+async def async_add_hubs(hass, client, entry_id):
+    """Add the hubs associated with the current client to device_registry."""
+    dev_reg = await hass.helpers.device_registry.async_get_registry()
+    for hub in await client.async_get_hubs():
+        _LOGGER.debug("Connected hub %s", hub['name'])
+        dev_reg.async_get_or_create(
+            config_entry_id=entry_id,
+            identifiers={(DOMAIN, hub['id'])},
+            manufacturer='Telldus',
+            name=hub['name'],
+            model=hub['type'],
+            sw_version=hub['version'],
+        )
+
+
+async def async_setup(hass, config):
+    """Set up the Telldus Live component."""
+    if DOMAIN not in config:
+        return True
+
+    hass.async_create_task(
+        hass.config_entries.flow.async_init(
+            DOMAIN,
+            context={'source': config_entries.SOURCE_IMPORT},
+            data={
+                KEY_HOST: config[DOMAIN].get(CONF_HOST),
+                KEY_SCAN_INTERVAL: config[DOMAIN].get(CONF_UPDATE_INTERVAL),
+            }))
+    return True
+
+
+async def async_unload_entry(hass, config_entry):
+    """Unload a config entry."""
+    interval_tracker = hass.data.pop(INTERVAL_TRACKER)
+    interval_tracker()
+    await asyncio.wait([
+        hass.config_entries.async_forward_entry_unload(config_entry, component)
+        for component in hass.data.pop(CONFIG_ENTRY_IS_SETUP)
+    ])
+    del hass.data[DOMAIN]
+    del hass.data[DATA_CONFIG_ENTRY_LOCK]
+    return True
+
+
 class TelldusLiveClient:
     """Get the latest data and update the states."""
 
-    def __init__(self, hass, config, session):
+    def __init__(self, hass, config_entry, session):
         """Initialize the Tellus data object."""
         self._known_devices = set()
+        self._device_infos = {}
 
         self._hass = hass
-        self._config = config
+        self._config_entry = config_entry
         self._client = session
 
-    def update(self, *args):
-        """Update local list of devices."""
-        _LOGGER.debug('Updating')
-        if not self._client.update():
+    async def async_get_hubs(self):
+        """Return hubs registered for the user."""
+        clients = await self._hass.async_add_executor_job(
+            self._client.get_clients)
+        return clients or []
+
+    def device_info(self, device_id):
+        """Return device info."""
+        return self._device_infos.get(device_id)
+
+    @staticmethod
+    def identify_device(device):
+        """Find out what type of HA component to create."""
+        if device.is_sensor:
+            return 'sensor'
+        from tellduslive import (DIM, UP, TURNON)
+        if device.methods & DIM:
+            return 'light'
+        if device.methods & UP:
+            return 'cover'
+        if device.methods & TURNON:
+            return 'switch'
+        if device.methods == 0:
+            return 'binary_sensor'
+        _LOGGER.warning("Unidentified device type (methods: %d)",
+                        device.methods)
+        return 'switch'
+
+    async def _discover(self, device_id):
+        """Discover the component."""
+        device = self._client.device(device_id)
+        component = self.identify_device(device)
+        self._device_infos.update({
+            device_id:
+            await self._hass.async_add_executor_job(device.info)
+        })
+        async with self._hass.data[DATA_CONFIG_ENTRY_LOCK]:
+            if component not in self._hass.data[CONFIG_ENTRY_IS_SETUP]:
+                await self._hass.config_entries.async_forward_entry_setup(
+                    self._config_entry, component)
+                self._hass.data[CONFIG_ENTRY_IS_SETUP].add(component)
+        device_ids = []
+        if device.is_sensor:
+            for item in device.items:
+                device_ids.append((device.device_id, item.name, item.scale))
+        else:
+            device_ids.append(device_id)
+        for _id in device_ids:
+            async_dispatcher_send(
+                self._hass, TELLDUS_DISCOVERY_NEW.format(component, DOMAIN),
+                _id)
+
+    async def update(self, *args):
+        """Periodically poll the servers for current state."""
+        if not await self._hass.async_add_executor_job(self._client.update):
             _LOGGER.warning('Failed request')
 
-        def identify_device(device):
-            """Find out what type of HA component to create."""
-            from tellduslive import (DIM, UP, TURNON)
-            if device.methods & DIM:
-                return 'light'
-            if device.methods & UP:
-                return 'cover'
-            if device.methods & TURNON:
-                return 'switch'
-            if device.methods == 0:
-                return 'binary_sensor'
-            _LOGGER.warning(
-                "Unidentified device type (methods: %d)", device.methods)
-            return 'switch'
-
-        def discover(device_id, component):
-            """Discover the component."""
-            discovery.load_platform(
-                self._hass, component, DOMAIN, [device_id], self._config)
-
-        for device in self._client.devices:
-            if device.device_id in self._known_devices:
-                continue
-            if device.is_sensor:
-                for item in device.items:
-                    discover((device.device_id, item.name, item.scale),
-                             'sensor')
-            else:
-                discover(device.device_id,
-                         identify_device(device))
-            self._known_devices.add(device.device_id)
-
-        dispatcher_send(self._hass, SIGNAL_UPDATE_ENTITY)
+        dev_ids = {dev.device_id for dev in self._client.devices}
+        new_devices = dev_ids - self._known_devices
+        # just await each discover as `gather` use up all HTTPAdapter pools
+        for d_id in new_devices:
+            await self._discover(d_id)
+        self._known_devices |= new_devices
+        async_dispatcher_send(self._hass, SIGNAL_UPDATE_ENTITY)
 
     def device(self, device_id):
         """Return device representation."""
diff --git a/homeassistant/components/tellduslive/config_flow.py b/homeassistant/components/tellduslive/config_flow.py
new file mode 100644
index 00000000000..64260b6047c
--- /dev/null
+++ b/homeassistant/components/tellduslive/config_flow.py
@@ -0,0 +1,150 @@
+"""Config flow for Tellduslive."""
+import asyncio
+import logging
+import os
+
+import async_timeout
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.util.json import load_json
+
+from .const import (
+    APPLICATION_NAME, CLOUD_NAME, DOMAIN, KEY_HOST, KEY_SCAN_INTERVAL,
+    KEY_SESSION, NOT_SO_PRIVATE_KEY, PUBLIC_KEY, SCAN_INTERVAL,
+    TELLDUS_CONFIG_FILE)
+
+KEY_TOKEN = 'token'
+KEY_TOKEN_SECRET = 'token_secret'
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@config_entries.HANDLERS.register('tellduslive')
+class FlowHandler(config_entries.ConfigFlow):
+    """Handle a config flow."""
+
+    VERSION = 1
+    CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_POLL
+
+    def __init__(self):
+        """Init config flow."""
+        self._hosts = [CLOUD_NAME]
+        self._host = None
+        self._session = None
+        self._scan_interval = SCAN_INTERVAL
+
+    def _get_auth_url(self):
+        return self._session.authorize_url
+
+    async def async_step_user(self, user_input=None):
+        """Let user select host or cloud."""
+        if self.hass.config_entries.async_entries(DOMAIN):
+            return self.async_abort(reason='already_setup')
+
+        if user_input is not None or len(self._hosts) == 1:
+            if user_input is not None and user_input[KEY_HOST] != CLOUD_NAME:
+                self._host = user_input[KEY_HOST]
+            return await self.async_step_auth()
+
+        return self.async_show_form(
+            step_id='user',
+            data_schema=vol.Schema({
+                vol.Required(KEY_HOST):
+                vol.In(list(self._hosts))
+            }))
+
+    async def async_step_auth(self, user_input=None):
+        """Handle the submitted configuration."""
+        if not self._session:
+            from tellduslive import Session
+            self._session = Session(
+                public_key=PUBLIC_KEY,
+                private_key=NOT_SO_PRIVATE_KEY,
+                host=self._host,
+                application=APPLICATION_NAME,
+            )
+
+        if user_input is not None and self._session.authorize():
+            host = self._host or CLOUD_NAME
+            if self._host:
+                session = {
+                    KEY_HOST: host,
+                    KEY_TOKEN: self._session.access_token
+                }
+            else:
+                session = {
+                    KEY_TOKEN: self._session.access_token,
+                    KEY_TOKEN_SECRET: self._session.access_token_secret
+                }
+            return self.async_create_entry(
+                title=host, data={
+                    KEY_HOST: host,
+                    KEY_SCAN_INTERVAL: self._scan_interval.seconds,
+                    KEY_SESSION: session,
+                })
+
+        try:
+            with async_timeout.timeout(10):
+                auth_url = await self.hass.async_add_executor_job(
+                    self._get_auth_url)
+        except asyncio.TimeoutError:
+            return self.async_abort(reason='authorize_url_timeout')
+        except Exception:  # pylint: disable=broad-except
+            _LOGGER.exception("Unexpected error generating auth url")
+            return self.async_abort(reason='authorize_url_fail')
+
+        _LOGGER.debug('Got authorization URL %s', auth_url)
+        return self.async_show_form(
+            step_id='auth',
+            description_placeholders={
+                'app_name': APPLICATION_NAME,
+                'auth_url': auth_url,
+            },
+        )
+
+    async def async_step_discovery(self, user_input):
+        """Run when a Tellstick is discovered."""
+        from tellduslive import supports_local_api
+        _LOGGER.info('Discovered tellstick device: %s', user_input)
+        # Ignore any known devices
+        for entry in self._async_current_entries():
+            if entry.data[KEY_HOST] == user_input[0]:
+                return self.async_abort(reason='already_configured')
+
+        if not supports_local_api(user_input[1]):
+            _LOGGER.debug('Tellstick does not support local API')
+            # Configure the cloud service
+            return await self.async_step_auth()
+
+        self._hosts.append(user_input[0])
+        return await self.async_step_user()
+
+    async def async_step_import(self, user_input):
+        """Import a config entry."""
+        if self.hass.config_entries.async_entries(DOMAIN):
+            return self.async_abort(reason='already_setup')
+
+        self._scan_interval = user_input[KEY_SCAN_INTERVAL]
+        if user_input[KEY_HOST] != DOMAIN:
+            self._hosts.append(user_input[KEY_HOST])
+
+        if not await self.hass.async_add_executor_job(
+                os.path.isfile, self.hass.config.path(TELLDUS_CONFIG_FILE)):
+            return await self.async_step_user()
+
+        conf = await self.hass.async_add_executor_job(
+            load_json, self.hass.config.path(TELLDUS_CONFIG_FILE))
+        host = next(iter(conf))
+
+        if user_input[KEY_HOST] != host:
+            return await self.async_step_user()
+
+        host = CLOUD_NAME if host == 'tellduslive' else host
+        return self.async_create_entry(
+            title=host,
+            data={
+                KEY_HOST: host,
+                KEY_SCAN_INTERVAL: self._scan_interval.seconds,
+                KEY_SESSION: next(iter(conf.values())),
+            })
diff --git a/homeassistant/components/tellduslive/const.py b/homeassistant/components/tellduslive/const.py
index a4ef33af518..81b3abefdee 100644
--- a/homeassistant/components/tellduslive/const.py
+++ b/homeassistant/components/tellduslive/const.py
@@ -1,5 +1,34 @@
 """Consts used by TelldusLive."""
+from datetime import timedelta
+
+from homeassistant.const import (  # noqa pylint: disable=unused-import
+    ATTR_BATTERY_LEVEL, CONF_HOST, CONF_TOKEN, DEVICE_DEFAULT_NAME)
+
+APPLICATION_NAME = 'Home Assistant'
 
 DOMAIN = 'tellduslive'
 
+TELLDUS_CONFIG_FILE = 'tellduslive.conf'
+KEY_CONFIG = 'tellduslive_config'
+
 SIGNAL_UPDATE_ENTITY = 'tellduslive_update'
+
+KEY_HOST = 'host'
+KEY_SESSION = 'session'
+KEY_SCAN_INTERVAL = 'scan_interval'
+
+CONF_TOKEN_SECRET = 'token_secret'
+CONF_UPDATE_INTERVAL = 'update_interval'
+
+PUBLIC_KEY = 'THUPUNECH5YEQA3RE6UYUPRUZ2DUGUGA'
+NOT_SO_PRIVATE_KEY = 'PHES7U2RADREWAFEBUSTUBAWRASWUTUS'
+
+MIN_UPDATE_INTERVAL = timedelta(seconds=5)
+SCAN_INTERVAL = timedelta(minutes=1)
+
+ATTR_LAST_UPDATED = 'time_last_updated'
+
+SIGNAL_UPDATE_ENTITY = 'tellduslive_update'
+TELLDUS_DISCOVERY_NEW = 'telldus_new_{}_{}'
+
+CLOUD_NAME = 'Cloud API'
diff --git a/homeassistant/components/tellduslive/entry.py b/homeassistant/components/tellduslive/entry.py
index 88b7d47ad9d..929dc700afb 100644
--- a/homeassistant/components/tellduslive/entry.py
+++ b/homeassistant/components/tellduslive/entry.py
@@ -111,3 +111,15 @@ class TelldusLiveEntity(Entity):
     def unique_id(self) -> str:
         """Return a unique ID."""
         return self._id
+
+    @property
+    def device_info(self):
+        """Return device info."""
+        device = self._client.device_info(self.device.device_id)
+        return {
+            'identifiers': {('tellduslive', self.device.device_id)},
+            'name': self.device.name,
+            'model': device['model'].title(),
+            'manufacturer': device['protocol'].title(),
+            'via_hub': ('tellduslive', device.get('client')),
+        }
diff --git a/homeassistant/components/tellduslive/strings.json b/homeassistant/components/tellduslive/strings.json
new file mode 100644
index 00000000000..7be98213222
--- /dev/null
+++ b/homeassistant/components/tellduslive/strings.json
@@ -0,0 +1,24 @@
+{
+  "config": {
+    "title": "Telldus Live",
+    "step": {
+      "user": {
+        "title": "Pick endpoint.",
+        "description": "",
+        "data": {
+          "host": "Host"
+        }
+      },
+      "auth": {
+          "title": "Authenticate against TelldusLive",
+          "description": "To link your TelldusLive account:\n 1. Click the link below\n 2. Login to Telldus Live\n 3. Authorize **{app_name}** (click **Yes**).\n 4. Come back here and click **SUBMIT**.\n\n [Link TelldusLive account]({auth_url})"
+      }
+    },
+    "abort": {
+      "authorize_url_timeout": "Timeout generating authorize url.",
+      "authorize_url_fail": "Unknown error generating an authorize url.",
+      "all_configured": "TelldusLive is already configured",
+      "unknown": "Unknown error occurred"
+    }
+  }
+}
diff --git a/homeassistant/components/tibber/__init__.py b/homeassistant/components/tibber/__init__.py
index 8462b646a22..8967021a0cf 100644
--- a/homeassistant/components/tibber/__init__.py
+++ b/homeassistant/components/tibber/__init__.py
@@ -16,7 +16,7 @@ from homeassistant.const import (EVENT_HOMEASSISTANT_STOP, CONF_ACCESS_TOKEN,
 from homeassistant.helpers import discovery
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-REQUIREMENTS = ['pyTibber==0.8.6']
+REQUIREMENTS = ['pyTibber==0.9.0']
 
 DOMAIN = 'tibber'
 
diff --git a/homeassistant/components/timer/__init__.py b/homeassistant/components/timer/__init__.py
index 3f758edea86..364975671c4 100644
--- a/homeassistant/components/timer/__init__.py
+++ b/homeassistant/components/timer/__init__.py
@@ -33,6 +33,9 @@ STATUS_PAUSED = 'paused'
 
 EVENT_TIMER_FINISHED = 'timer.finished'
 EVENT_TIMER_CANCELLED = 'timer.cancelled'
+EVENT_TIMER_STARTED = 'timer.started'
+EVENT_TIMER_RESTARTED = 'timer.restarted'
+EVENT_TIMER_PAUSED = 'timer.paused'
 
 SERVICE_START = 'start'
 SERVICE_PAUSE = 'pause'
@@ -158,6 +161,10 @@ class Timer(RestoreEntity):
         if duration:
             newduration = duration
 
+        event = EVENT_TIMER_STARTED
+        if self._state == STATUS_PAUSED:
+            event = EVENT_TIMER_RESTARTED
+
         self._state = STATUS_ACTIVE
         # pylint: disable=redefined-outer-name
         start = dt_util.utcnow()
@@ -170,6 +177,10 @@ class Timer(RestoreEntity):
             else:
                 self._remaining = self._duration
             self._end = start + self._duration
+
+        self._hass.bus.async_fire(event,
+                                  {"entity_id": self.entity_id})
+
         self._listener = async_track_point_in_utc_time(self._hass,
                                                        self.async_finished,
                                                        self._end)
@@ -185,6 +196,8 @@ class Timer(RestoreEntity):
         self._remaining = self._end - dt_util.utcnow()
         self._state = STATUS_PAUSED
         self._end = None
+        self._hass.bus.async_fire(EVENT_TIMER_PAUSED,
+                                  {"entity_id": self.entity_id})
         await self.async_update_ha_state()
 
     async def async_cancel(self):
diff --git a/homeassistant/components/tradfri/.translations/ca.json b/homeassistant/components/tradfri/.translations/ca.json
index acbbb275fc3..22d70092f0d 100644
--- a/homeassistant/components/tradfri/.translations/ca.json
+++ b/homeassistant/components/tradfri/.translations/ca.json
@@ -4,8 +4,8 @@
             "already_configured": "L'enlla\u00e7 ja est\u00e0 configurat"
         },
         "error": {
-            "cannot_connect": "No es pot connectar amb la passarel\u00b7la d'enlla\u00e7",
-            "invalid_key": "Ha fallat el registre amb la clau proporcionada. Si aix\u00f2 continua passant, intenteu reiniciar la passarel\u00b7la d'enlla\u00e7.",
+            "cannot_connect": "No s'ha pogut connectar a la passarel\u00b7la d'enlla\u00e7",
+            "invalid_key": "Ha fallat el registre amb la clau proporcionada. Si aix\u00f2 continua passant, intenta reiniciar la passarel\u00b7la d'enlla\u00e7.",
             "timeout": "S'ha acabat el temps d'espera durant la validaci\u00f3 del codi."
         },
         "step": {
@@ -14,8 +14,8 @@
                     "host": "Amfitri\u00f3",
                     "security_code": "Codi de seguretat"
                 },
-                "description": "Podeu trobar el codi de seguretat a la part posterior de la vostra passarel\u00b7la d'enlla\u00e7.",
-                "title": "Introdu\u00efu el codi de seguretat"
+                "description": "Pots trobar el codi de seguretat a la part posterior de la teva passarel\u00b7la d'enlla\u00e7.",
+                "title": "Introdueix el codi de seguretat"
             }
         },
         "title": "IKEA TR\u00c5DFRI"
diff --git a/homeassistant/components/tradfri/.translations/hu.json b/homeassistant/components/tradfri/.translations/hu.json
index dc7c033d41d..88ff9e6104b 100644
--- a/homeassistant/components/tradfri/.translations/hu.json
+++ b/homeassistant/components/tradfri/.translations/hu.json
@@ -5,6 +5,7 @@
         },
         "error": {
             "cannot_connect": "Nem siker\u00fclt csatlakozni a gatewayhez.",
+            "invalid_key": "Nem siker\u00fclt regisztr\u00e1lni a megadott kulcs seg\u00edts\u00e9g\u00e9vel. Ha ez t\u00f6bbsz\u00f6r megt\u00f6rt\u00e9nik, pr\u00f3b\u00e1lja meg \u00fajraind\u00edtani a gatewayt.",
             "timeout": "Id\u0151t\u00fall\u00e9p\u00e9s a k\u00f3d \u00e9rv\u00e9nyes\u00edt\u00e9se sor\u00e1n."
         },
         "step": {
diff --git a/homeassistant/components/tts/yandextts.py b/homeassistant/components/tts/yandextts.py
index d0ec8c74a96..112e78413ed 100644
--- a/homeassistant/components/tts/yandextts.py
+++ b/homeassistant/components/tts/yandextts.py
@@ -31,7 +31,12 @@ SUPPORT_CODECS = [
 
 SUPPORT_VOICES = [
     'jane', 'oksana', 'alyss', 'omazh',
-    'zahar', 'ermil'
+    'zahar', 'ermil', 'levitan', 'ermilov',
+    'silaerkan', 'kolya', 'kostya', 'nastya',
+    'sasha', 'nick', 'erkanyavas', 'zhenya',
+    'tanya', 'anton_samokhvalov', 'tatyana_abramova',
+    'voicesearch', 'ermil_with_tuning', 'robot',
+    'dude', 'zombie', 'smoky'
 ]
 
 SUPPORTED_EMOTION = [
diff --git a/homeassistant/components/twilio/.translations/ca.json b/homeassistant/components/twilio/.translations/ca.json
index 6f9e22bfd40..324ab0dd69a 100644
--- a/homeassistant/components/twilio/.translations/ca.json
+++ b/homeassistant/components/twilio/.translations/ca.json
@@ -1,16 +1,16 @@
 {
     "config": {
         "abort": {
-            "not_internet_accessible": "La vostra inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de Twilio.",
+            "not_internet_accessible": "La inst\u00e0ncia de Home Assistant ha de ser accessible des d'Internet per rebre missatges de Twilio.",
             "one_instance_allowed": "Nom\u00e9s cal una sola inst\u00e0ncia."
         },
         "create_entry": {
-            "default": "Per enviar esdeveniments a Home Assistant, haureu de configurar [Webhooks amb Twilio]({twilio_url}).\n\n Ompliu la informaci\u00f3 seg\u00fcent: \n\n - URL: `{webhook_url}` \n - M\u00e8tode: POST \n - Tipus de contingut: application/x-www-form-urlencoded\n\nVegeu [la documentaci\u00f3]({docs_url}) sobre com configurar els automatismes per gestionar les dades entrants."
+            "default": "Per enviar esdeveniments a Home Assistant, haur\u00e0s de configurar [Webhooks amb Twilio]({twilio_url}).\n\nCompleta la seg\u00fcent informaci\u00f3 : \n\n- URL: `{webhook_url}` \n- M\u00e8tode: POST \n- Tipus de contingut: application/x-www-form-urlencoded\n\nConsulta la [documentaci\u00f3]({docs_url}) sobre com configurar els automatismes per gestionar dades entrants."
         },
         "step": {
             "user": {
-                "description": "Esteu segur que voleu configurar Twilio?",
-                "title": "Configureu el Webhook de Twilio"
+                "description": "Est\u00e0s segur que vols configurar Twilio?",
+                "title": "Configuraci\u00f3 del Webhook de Twilio"
             }
         },
         "title": "Twilio"
diff --git a/homeassistant/components/twilio/.translations/hu.json b/homeassistant/components/twilio/.translations/hu.json
new file mode 100644
index 00000000000..257dd24f082
--- /dev/null
+++ b/homeassistant/components/twilio/.translations/hu.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "one_instance_allowed": "Csak egyetlen konfigur\u00e1ci\u00f3 sz\u00fcks\u00e9ges."
+        }
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/unifi/.translations/ca.json b/homeassistant/components/unifi/.translations/ca.json
index 77d859627dc..442d82d9a3f 100644
--- a/homeassistant/components/unifi/.translations/ca.json
+++ b/homeassistant/components/unifi/.translations/ca.json
@@ -18,7 +18,7 @@
                     "username": "Nom d'usuari",
                     "verify_ssl": "El controlador est\u00e0 utilitzant un certificat adequat"
                 },
-                "title": "Configura el controlador UniFi"
+                "title": "Configuraci\u00f3 del controlador UniFi"
             }
         },
         "title": "Controlador UniFi"
diff --git a/homeassistant/components/unifi/.translations/hu.json b/homeassistant/components/unifi/.translations/hu.json
index 06104c6ed6c..4a664a40c74 100644
--- a/homeassistant/components/unifi/.translations/hu.json
+++ b/homeassistant/components/unifi/.translations/hu.json
@@ -10,8 +10,10 @@
         "step": {
             "user": {
                 "data": {
+                    "host": "Host",
                     "password": "Jelsz\u00f3",
                     "port": "Port",
+                    "site": "Site azonos\u00edt\u00f3",
                     "username": "Felhaszn\u00e1l\u00f3n\u00e9v"
                 }
             }
diff --git a/homeassistant/components/unifi/.translations/ru.json b/homeassistant/components/unifi/.translations/ru.json
index ca1a802a580..381f4831c53 100644
--- a/homeassistant/components/unifi/.translations/ru.json
+++ b/homeassistant/components/unifi/.translations/ru.json
@@ -15,7 +15,8 @@
                     "password": "\u041f\u0430\u0440\u043e\u043b\u044c",
                     "port": "\u041f\u043e\u0440\u0442",
                     "site": "ID \u0441\u0430\u0439\u0442\u0430",
-                    "username": "\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f"
+                    "username": "\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f",
+                    "verify_ssl": "\u041a\u043e\u043d\u0442\u0440\u043e\u043b\u043b\u0435\u0440 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442 \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0439 \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442"
                 },
                 "title": "UniFi Controller"
             }
diff --git a/homeassistant/components/upcloud.py b/homeassistant/components/upcloud.py
index a0b61f86e56..ca0f554bd39 100644
--- a/homeassistant/components/upcloud.py
+++ b/homeassistant/components/upcloud.py
@@ -19,7 +19,7 @@ from homeassistant.helpers.dispatcher import (
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.event import track_time_interval
 
-REQUIREMENTS = ['upcloud-api==0.4.2']
+REQUIREMENTS = ['upcloud-api==0.4.3']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/upnp/.translations/ca.json b/homeassistant/components/upnp/.translations/ca.json
index ab09dbc5bda..5f2606a448f 100644
--- a/homeassistant/components/upnp/.translations/ca.json
+++ b/homeassistant/components/upnp/.translations/ca.json
@@ -13,7 +13,7 @@
             "user": {
                 "data": {
                     "enable_port_mapping": "Activa l'assignaci\u00f3 de ports per a Home Assistant",
-                    "enable_sensors": "Afegiu sensors de tr\u00e0nsit",
+                    "enable_sensors": "Afegeix sensors de tr\u00e0nsit",
                     "igd": "UPnP/IGD"
                 },
                 "title": "Opcions de configuraci\u00f3 per a UPnP/IGD"
diff --git a/homeassistant/components/upnp/.translations/hu.json b/homeassistant/components/upnp/.translations/hu.json
index fc0225cc534..466c80f9e56 100644
--- a/homeassistant/components/upnp/.translations/hu.json
+++ b/homeassistant/components/upnp/.translations/hu.json
@@ -1,5 +1,9 @@
 {
     "config": {
+        "error": {
+            "one": "hiba",
+            "other": ""
+        },
         "step": {
             "init": {
                 "title": "UPnP/IGD"
diff --git a/homeassistant/components/upnp/__init__.py b/homeassistant/components/upnp/__init__.py
index 925ca561eb9..d44cf2a8683 100644
--- a/homeassistant/components/upnp/__init__.py
+++ b/homeassistant/components/upnp/__init__.py
@@ -4,32 +4,32 @@ Will open a port in your router for Home Assistant and provide statistics.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/upnp/
 """
-import asyncio
 from ipaddress import ip_address
 
-import aiohttp
 import voluptuous as vol
 
+from homeassistant import config_entries
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
+from homeassistant.helpers import config_entry_flow
 from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers import dispatcher
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.util import get_local_ip
 
 from .const import (
     CONF_ENABLE_PORT_MAPPING, CONF_ENABLE_SENSORS,
     CONF_HASS, CONF_LOCAL_IP, CONF_PORTS,
-    CONF_UDN, CONF_SSDP_DESCRIPTION,
     SIGNAL_REMOVE_SENSOR,
 )
 from .const import DOMAIN
 from .const import LOGGER as _LOGGER
-from .config_flow import async_ensure_domain_data
 from .device import Device
 
 
-REQUIREMENTS = ['async-upnp-client==0.13.2']
+REQUIREMENTS = ['async-upnp-client==0.13.8']
 
 NOTIFICATION_ID = 'upnp_notification'
 NOTIFICATION_TITLE = 'UPnP/IGD Setup'
@@ -83,78 +83,113 @@ def _substitute_hass_ports(ports, hass_port=None):
     return ports
 
 
-# config
+async def async_discover_and_construct(hass, udn=None) -> Device:
+    """Discovery devices and construct a Device for one."""
+    discovery_infos = await Device.async_discover(hass)
+    if not discovery_infos:
+        _LOGGER.info('No UPnP/IGD devices discovered')
+        return None
+
+    if udn:
+        # get the discovery info with specified UDN
+        filtered = [di for di in discovery_infos if di['udn'] == udn]
+        if not filtered:
+            _LOGGER.warning('Wanted UPnP/IGD device with UDN "%s" not found, '
+                            'aborting', udn)
+            return None
+        discovery_info = filtered[0]
+    else:
+        # get the first/any
+        discovery_info = discovery_infos[0]
+        if len(discovery_infos) > 1:
+            device_name = discovery_info.get(
+                'usn', discovery_info.get('ssdp_description', ''))
+            _LOGGER.info('Detected multiple UPnP/IGD devices, using: %s',
+                         device_name)
+
+    ssdp_description = discovery_info['ssdp_description']
+    return await Device.async_create_device(hass, ssdp_description)
+
+
 async def async_setup(hass: HomeAssistantType, config: ConfigType):
-    """Register a port mapping for Home Assistant via UPnP."""
-    await async_ensure_domain_data(hass)
-
-    # ensure sane config
-    if DOMAIN not in config:
-        return True
-    upnp_config = config[DOMAIN]
-
-    # overridden local ip
-    if CONF_LOCAL_IP in upnp_config:
-        hass.data[DOMAIN]['local_ip'] = upnp_config[CONF_LOCAL_IP]
-
-    # determine ports
-    ports = {CONF_HASS: CONF_HASS}  # default, port_mapping disabled by default
-    if CONF_PORTS in upnp_config:
-        # copy from config
-        ports = upnp_config[CONF_PORTS]
-
-    hass.data[DOMAIN]['auto_config'] = {
-        'active': True,
-        'enable_sensors': upnp_config[CONF_ENABLE_SENSORS],
-        'enable_port_mapping': upnp_config[CONF_ENABLE_PORT_MAPPING],
-        'ports': ports,
+    """Set up UPnP component."""
+    conf_default = CONFIG_SCHEMA({DOMAIN: {}})[DOMAIN]
+    conf = config.get(DOMAIN, conf_default)
+    local_ip = await hass.async_add_executor_job(get_local_ip)
+    hass.data[DOMAIN] = {
+        'config': conf,
+        'devices': {},
+        'local_ip': config.get(CONF_LOCAL_IP, local_ip),
+        'ports': conf.get('ports', {}),
     }
 
+    if conf is not None:
+        hass.async_create_task(hass.config_entries.flow.async_init(
+            DOMAIN, context={'source': config_entries.SOURCE_IMPORT}))
+
     return True
 
 
-# config flow
 async def async_setup_entry(hass: HomeAssistantType,
                             config_entry: ConfigEntry):
-    """Set up UPnP/IGD-device from a config entry."""
-    await async_ensure_domain_data(hass)
-    data = config_entry.data
+    """Set up UPnP/IGD device from a config entry."""
+    domain_data = hass.data[DOMAIN]
+    conf = domain_data['config']
 
-    # build UPnP/IGD device
-    ssdp_description = data[CONF_SSDP_DESCRIPTION]
-    try:
-        device = await Device.async_create_device(hass, ssdp_description)
-    except (asyncio.TimeoutError, aiohttp.ClientError):
-        _LOGGER.error('Unable to create upnp-device')
+    # discover and construct
+    device = await async_discover_and_construct(hass,
+                                                config_entry.data.get('udn'))
+    if not device:
+        _LOGGER.info('Unable to create UPnP/IGD, aborting')
         return False
 
+    # 'register'/save UDN
+    config_entry.data['udn'] = device.udn
     hass.data[DOMAIN]['devices'][device.udn] = device
+    hass.config_entries.async_update_entry(entry=config_entry,
+                                           data=config_entry.data)
 
-    # port mapping
-    if data.get(CONF_ENABLE_PORT_MAPPING):
-        local_ip = hass.data[DOMAIN]['local_ip']
-        ports = hass.data[DOMAIN]['auto_config']['ports']
-        _LOGGER.debug('Enabling port mappings: %s', ports)
+    # create device registry entry
+    device_registry = await dr.async_get_registry(hass)
+    device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={
+            (dr.CONNECTION_UPNP, device.udn)
+        },
+        identifiers={
+            (DOMAIN, device.udn)
+        },
+        name=device.name,
+        manufacturer=device.manufacturer,
+    )
 
-        hass_port = None
-        if hasattr(hass, 'http'):
-            hass_port = hass.http.server_port
-        ports = _substitute_hass_ports(ports, hass_port=hass_port)
-        await device.async_add_port_mappings(ports, local_ip)
-
-    # sensors
-    if data.get(CONF_ENABLE_SENSORS):
+    # set up sensors
+    if conf.get(CONF_ENABLE_SENSORS):
         _LOGGER.debug('Enabling sensors')
 
         # register sensor setup handlers
         hass.async_create_task(hass.config_entries.async_forward_entry_setup(
             config_entry, 'sensor'))
 
+    # set up port mapping
+    if conf.get(CONF_ENABLE_PORT_MAPPING):
+        _LOGGER.debug('Enabling port mapping')
+        local_ip = domain_data['local_ip']
+        ports = conf.get('ports', {})
+
+        hass_port = None
+        if hasattr(hass, 'http'):
+            hass_port = hass.http.server_port
+
+        ports = _substitute_hass_ports(ports, hass_port=hass_port)
+        await device.async_add_port_mappings(ports, local_ip)
+
+    # set up port mapping deletion on stop-hook
     async def delete_port_mapping(event):
         """Delete port mapping on quit."""
-        if data.get(CONF_ENABLE_PORT_MAPPING):
-            _LOGGER.debug('Deleting port mappings')
-            await device.async_delete_port_mappings()
+        _LOGGER.debug('Deleting port mappings')
+        await device.async_delete_port_mappings()
+
     hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, delete_port_mapping)
 
     return True
@@ -162,25 +197,23 @@ async def async_setup_entry(hass: HomeAssistantType,
 
 async def async_unload_entry(hass: HomeAssistantType,
                              config_entry: ConfigEntry):
-    """Unload a config entry."""
-    data = config_entry.data
-    udn = data[CONF_UDN]
-
-    if udn not in hass.data[DOMAIN]['devices']:
-        return True
+    """Unload a UPnP/IGD device from a config entry."""
+    udn = config_entry.data['udn']
     device = hass.data[DOMAIN]['devices'][udn]
 
-    # port mapping
-    if data.get(CONF_ENABLE_PORT_MAPPING):
-        _LOGGER.debug('Deleting port mappings')
-        await device.async_delete_port_mappings()
+    # remove port mapping
+    _LOGGER.debug('Deleting port mappings')
+    await device.async_delete_port_mappings()
 
-    # sensors
-    if data.get(CONF_ENABLE_SENSORS):
-        _LOGGER.debug('Deleting sensors')
-        dispatcher.async_dispatcher_send(hass, SIGNAL_REMOVE_SENSOR, device)
-
-    # clear stored device
-    del hass.data[DOMAIN]['devices'][udn]
+    # remove sensors
+    _LOGGER.debug('Deleting sensors')
+    dispatcher.async_dispatcher_send(hass, SIGNAL_REMOVE_SENSOR, device)
 
     return True
+
+
+config_entry_flow.register_discovery_flow(
+    DOMAIN,
+    'UPnP/IGD',
+    Device.async_discover,
+    config_entries.CONN_CLASS_LOCAL_POLL)
diff --git a/homeassistant/components/upnp/config_flow.py b/homeassistant/components/upnp/config_flow.py
deleted file mode 100644
index 1a6526638ba..00000000000
--- a/homeassistant/components/upnp/config_flow.py
+++ /dev/null
@@ -1,179 +0,0 @@
-"""Config flow for UPNP."""
-import logging
-from collections import OrderedDict
-
-import voluptuous as vol
-
-from homeassistant import config_entries
-from homeassistant import data_entry_flow
-from homeassistant.util import get_local_ip
-
-from .const import (
-    CONF_ENABLE_PORT_MAPPING, CONF_ENABLE_SENSORS,
-    CONF_SSDP_DESCRIPTION, CONF_UDN
-)
-from .const import DOMAIN
-
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_ensure_domain_data(hass):
-    """Ensure hass.data is filled properly."""
-    hass.data[DOMAIN] = hass.data.get(DOMAIN, {})
-    hass.data[DOMAIN]['devices'] = hass.data[DOMAIN].get('devices', {})
-    hass.data[DOMAIN]['discovered'] = hass.data[DOMAIN].get('discovered', {})
-    hass.data[DOMAIN]['auto_config'] = hass.data[DOMAIN].get('auto_config', {
-        'active': False,
-        'enable_sensors': False,
-        'enable_port_mapping': False,
-        'ports': {'hass': 'hass'},
-    })
-    if 'local_ip' not in hass.data[DOMAIN]:
-        hass.data[DOMAIN]['local_ip'] = \
-            await hass.async_add_executor_job(get_local_ip)
-
-
-@config_entries.HANDLERS.register(DOMAIN)
-class UpnpFlowHandler(data_entry_flow.FlowHandler):
-    """Handle a UPnP/IGD config flow."""
-
-    VERSION = 1
-    CONNECTION_CLASS = config_entries.CONN_CLASS_LOCAL_POLL
-
-    @property
-    def _configured_upnp_igds(self):
-        """Get all configured IGDs."""
-        return {
-            entry.data[CONF_UDN]: {
-                'udn': entry.data[CONF_UDN],
-            }
-            for entry in self.hass.config_entries.async_entries(DOMAIN)
-        }
-
-    @property
-    def _discovered_upnp_igds(self):
-        """Get all discovered entries."""
-        return self.hass.data[DOMAIN]['discovered']
-
-    def _store_discovery_info(self, discovery_info):
-        """Add discovery info."""
-        udn = discovery_info['udn']
-        self.hass.data[DOMAIN]['discovered'][udn] = discovery_info
-
-    def _auto_config_settings(self):
-        """Check if auto_config has been enabled."""
-        return self.hass.data[DOMAIN]['auto_config']
-
-    async def async_step_discovery(self, discovery_info):
-        """
-        Handle a discovered UPnP/IGD.
-
-        This flow is triggered by the discovery component. It will check if the
-        host is already configured and delegate to the import step if not.
-        """
-        await async_ensure_domain_data(self.hass)
-
-        if not discovery_info.get('udn') or not discovery_info.get('host'):
-            # Silently ignore incomplete/broken devices to prevent constant
-            # errors/warnings
-            _LOGGER.debug('UPnP device is missing the udn. Provided info: %r',
-                          discovery_info)
-            return self.async_abort(reason='incomplete_device')
-
-        # store discovered device
-        discovery_info['friendly_name'] = discovery_info.get('host', '')
-
-        # add name if available
-        if discovery_info.get('name'):
-            discovery_info['friendly_name'] += ' ({name})'.format(
-                **discovery_info)
-
-        self._store_discovery_info(discovery_info)
-
-        # ensure not already discovered/configured
-        if discovery_info.get('udn') in self._configured_upnp_igds:
-            return self.async_abort(reason='already_configured')
-
-        # auto config?
-        auto_config = self._auto_config_settings()
-        if auto_config['active']:
-            import_info = {
-                'name': discovery_info['friendly_name'],
-                'enable_sensors': auto_config['enable_sensors'],
-                'enable_port_mapping': auto_config['enable_port_mapping'],
-            }
-
-            return await self._async_save_entry(import_info)
-
-        return await self.async_step_user()
-
-    async def async_step_user(self, user_input=None):
-        """Manual set up."""
-        await async_ensure_domain_data(self.hass)
-
-        # if user input given, handle it
-        user_input = user_input or {}
-        if 'name' in user_input:
-            if not user_input['enable_sensors'] and \
-               not user_input['enable_port_mapping']:
-                return self.async_abort(reason='no_sensors_or_port_mapping')
-
-            # ensure not already configured
-            configured_names = [
-                entry['friendly_name']
-                for udn, entry in self._discovered_upnp_igds.items()
-                if udn in self._configured_upnp_igds
-            ]
-            if user_input['name'] in configured_names:
-                return self.async_abort(reason='already_configured')
-
-            return await self._async_save_entry(user_input)
-
-        # let user choose from all discovered, non-configured, UPnP/IGDs
-        names = [
-            entry['friendly_name']
-            for udn, entry in self._discovered_upnp_igds.items()
-            if udn not in self._configured_upnp_igds
-        ]
-        if not names:
-            return self.async_abort(reason='no_devices_discovered')
-
-        return self.async_show_form(
-            step_id='user',
-            data_schema=vol.Schema(
-                OrderedDict([
-                    (vol.Required('name'), vol.In(names)),
-                    (vol.Optional('enable_sensors', default=False), bool),
-                    (vol.Optional('enable_port_mapping', default=False), bool),
-                ])
-            ))
-
-    async def async_step_import(self, import_info):
-        """Import a new UPnP/IGD as a config entry."""
-        await async_ensure_domain_data(self.hass)
-
-        return await self._async_save_entry(import_info)
-
-    async def _async_save_entry(self, import_info):
-        """Store UPNP/IGD as new entry."""
-        await async_ensure_domain_data(self.hass)
-
-        # ensure we know the host
-        name = import_info['name']
-        discovery_infos = [info
-                           for info in self._discovered_upnp_igds.values()
-                           if info['friendly_name'] == name]
-        if not discovery_infos:
-            return self.async_abort(reason='host_not_found')
-        discovery_info = discovery_infos[0]
-
-        return self.async_create_entry(
-            title=discovery_info['name'],
-            data={
-                CONF_SSDP_DESCRIPTION: discovery_info['ssdp_description'],
-                CONF_UDN: discovery_info['udn'],
-                CONF_ENABLE_SENSORS: import_info['enable_sensors'],
-                CONF_ENABLE_PORT_MAPPING: import_info['enable_port_mapping'],
-            },
-        )
diff --git a/homeassistant/components/upnp/const.py b/homeassistant/components/upnp/const.py
index 7a906ae02be..04932488acd 100644
--- a/homeassistant/components/upnp/const.py
+++ b/homeassistant/components/upnp/const.py
@@ -7,8 +7,6 @@ CONF_ENABLE_SENSORS = 'sensors'
 CONF_HASS = 'hass'
 CONF_LOCAL_IP = 'local_ip'
 CONF_PORTS = 'ports'
-CONF_SSDP_DESCRIPTION = 'ssdp_description'
-CONF_UDN = 'udn'
 DOMAIN = 'upnp'
 LOGGER = logging.getLogger('homeassistant.components.upnp')
 SIGNAL_REMOVE_SENSOR = 'upnp_remove_sensor'
diff --git a/homeassistant/components/upnp/device.py b/homeassistant/components/upnp/device.py
index 4a0b7b61dd4..a99123129aa 100644
--- a/homeassistant/components/upnp/device.py
+++ b/homeassistant/components/upnp/device.py
@@ -18,6 +18,27 @@ class Device:
         self._igd_device = igd_device
         self._mapped_ports = []
 
+    @classmethod
+    async def async_discover(cls, hass: HomeAssistantType):
+        """Discovery UPNP/IGD devices."""
+        _LOGGER.debug('Discovering UPnP/IGD devices')
+
+        # discover devices
+        from async_upnp_client.igd import IgdDevice
+        discovery_infos = await IgdDevice.async_discover()
+
+        # add extra info and store devices
+        devices = []
+        for discovery_info in discovery_infos:
+            discovery_info['udn'] = discovery_info['usn'].split('::')[0]
+            discovery_info['ssdp_description'] = discovery_info['location']
+            discovery_info['source'] = 'async_upnp_client'
+            _LOGGER.debug('Discovered device: %s', discovery_info)
+
+            devices.append(discovery_info)
+
+        return devices
+
     @classmethod
     async def async_create_device(cls,
                                   hass: HomeAssistantType,
@@ -34,7 +55,7 @@ class Device:
                               disable_state_variable_validation=True)
         upnp_device = await factory.async_create_device(ssdp_description)
 
-        # wrap with async_upnp_client IgdDevice
+        # wrap with async_upnp_client.IgdDevice
         from async_upnp_client.igd import IgdDevice
         igd_device = IgdDevice(upnp_device, None)
 
@@ -50,6 +71,11 @@ class Device:
         """Get the name."""
         return self._igd_device.name
 
+    @property
+    def manufacturer(self):
+        """Get the manufacturer."""
+        return self._igd_device.manufacturer
+
     async def async_add_port_mappings(self, ports, local_ip):
         """Add port mappings."""
         if local_ip == '127.0.0.1':
diff --git a/homeassistant/components/upnp/strings.json b/homeassistant/components/upnp/strings.json
index 40bcb46d386..f4de9ad4c0d 100644
--- a/homeassistant/components/upnp/strings.json
+++ b/homeassistant/components/upnp/strings.json
@@ -1,24 +1,15 @@
 {
-    "config": {
+  "config": {
+    "title": "UPnP/IGD",
+    "step": {
+      "confirm": {
         "title": "UPnP/IGD",
-        "step": {
-            "init": {
-                "title": "UPnP/IGD"
-            },
-            "user": {
-                "title": "Configuration options for the UPnP/IGD",
-                "data":{
-                    "igd": "UPnP/IGD",
-                    "enable_sensors": "Add traffic sensors",
-                    "enable_port_mapping": "Enable port mapping for Home Assistant"
-                }
-            }
-        },
-        "abort": {
-            "no_devices_discovered": "No UPnP/IGDs discovered",
-            "incomplete_device": "Ignoring incomplete UPnP device",
-            "already_configured": "UPnP/IGD is already configured",
-            "no_sensors_or_port_mapping": "Enable at least sensors or port mapping"
-        }
+        "description": "Do you want to set up UPnP/IGD?"
+      }
+    },
+    "abort": {
+      "single_instance_allowed": "Only a single configuration of UPnP/IGD is necessary.",
+      "no_devices_found": "No UPnP/IGD devices found on the network."
     }
+  }
 }
diff --git a/homeassistant/components/vacuum/__init__.py b/homeassistant/components/vacuum/__init__.py
index 212e6bd648f..4799e945be0 100644
--- a/homeassistant/components/vacuum/__init__.py
+++ b/homeassistant/components/vacuum/__init__.py
@@ -49,7 +49,7 @@ SERVICE_PAUSE = 'pause'
 SERVICE_STOP = 'stop'
 
 VACUUM_SERVICE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
 })
 
 VACUUM_SET_FAN_SPEED_SERVICE_SCHEMA = VACUUM_SERVICE_SCHEMA.extend({
diff --git a/homeassistant/components/vacuum/neato.py b/homeassistant/components/vacuum/neato.py
index 83a4ad7c58d..0c97f99df99 100644
--- a/homeassistant/components/vacuum/neato.py
+++ b/homeassistant/components/vacuum/neato.py
@@ -82,6 +82,7 @@ class NeatoConnectedVacuum(StateVacuumDevice):
             self._available = False
             return
         _LOGGER.debug('self._state=%s', self._state)
+        robot_alert = ALERTS.get(self._state['alert'])
         if self._state['state'] == 1:
             if self._state['details']['isCharging']:
                 self._clean_state = STATE_DOCKED
@@ -93,14 +94,17 @@ class NeatoConnectedVacuum(StateVacuumDevice):
             else:
                 self._clean_state = STATE_IDLE
                 self._status_state = 'Stopped'
+
+            if robot_alert is not None:
+                self._status_state = robot_alert
         elif self._state['state'] == 2:
-            if ALERTS.get(self._state['error']) is None:
+            if robot_alert is None:
                 self._clean_state = STATE_CLEANING
                 self._status_state = (
                     MODE.get(self._state['cleaning']['mode'])
                     + ' ' + ACTION.get(self._state['action']))
             else:
-                self._status_state = ALERTS.get(self._state['error'])
+                self._status_state = robot_alert
         elif self._state['state'] == 3:
             self._clean_state = STATE_PAUSED
             self._status_state = 'Paused'
diff --git a/homeassistant/components/volvooncall.py b/homeassistant/components/volvooncall.py
index 75339171cbc..9f9b58ec8b6 100644
--- a/homeassistant/components/volvooncall.py
+++ b/homeassistant/components/volvooncall.py
@@ -15,6 +15,7 @@ from homeassistant.helpers import discovery
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.event import async_track_point_in_utc_time
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.dispatcher import (
     async_dispatcher_send,
     async_dispatcher_connect)
@@ -24,7 +25,7 @@ DOMAIN = 'volvooncall'
 
 DATA_KEY = DOMAIN
 
-REQUIREMENTS = ['volvooncall==0.7.11']
+REQUIREMENTS = ['volvooncall==0.8.7']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -106,12 +107,15 @@ CONFIG_SCHEMA = vol.Schema({
 
 async def async_setup(hass, config):
     """Set up the Volvo On Call component."""
+    session = async_get_clientsession(hass)
+
     from volvooncall import Connection
     connection = Connection(
-        config[DOMAIN].get(CONF_USERNAME),
-        config[DOMAIN].get(CONF_PASSWORD),
-        config[DOMAIN].get(CONF_SERVICE_URL),
-        config[DOMAIN].get(CONF_REGION))
+        session=session,
+        username=config[DOMAIN].get(CONF_USERNAME),
+        password=config[DOMAIN].get(CONF_PASSWORD),
+        service_url=config[DOMAIN].get(CONF_SERVICE_URL),
+        region=config[DOMAIN].get(CONF_REGION))
 
     interval = config[DOMAIN].get(CONF_UPDATE_INTERVAL)
 
diff --git a/homeassistant/components/water_heater/__init__.py b/homeassistant/components/water_heater/__init__.py
index 92dbebc4421..fee2846e8d5 100644
--- a/homeassistant/components/water_heater/__init__.py
+++ b/homeassistant/components/water_heater/__init__.py
@@ -57,22 +57,22 @@ CONVERTIBLE_ATTRIBUTE = [
 _LOGGER = logging.getLogger(__name__)
 
 ON_OFF_SERVICE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
 })
 
 SET_AWAY_MODE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Required(ATTR_AWAY_MODE): cv.boolean,
 })
 SET_TEMPERATURE_SCHEMA = vol.Schema(vol.All(
     {
         vol.Required(ATTR_TEMPERATURE, 'temperature'): vol.Coerce(float),
-        vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+        vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
         vol.Optional(ATTR_OPERATION_MODE): cv.string,
     }
 ))
 SET_OPERATION_MODE_SCHEMA = vol.Schema({
-    vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
+    vol.Optional(ATTR_ENTITY_ID): cv.comp_entity_ids,
     vol.Required(ATTR_OPERATION_MODE): cv.string,
 })
 
diff --git a/homeassistant/components/weather/__init__.py b/homeassistant/components/weather/__init__.py
index 725c7f609a7..b9cb300ee21 100644
--- a/homeassistant/components/weather/__init__.py
+++ b/homeassistant/components/weather/__init__.py
@@ -4,6 +4,7 @@ Weather component that handles meteorological data for your location.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/weather/
 """
+from datetime import timedelta
 import logging
 
 from homeassistant.helpers.entity_component import EntityComponent
@@ -14,11 +15,6 @@ from homeassistant.helpers.entity import Entity
 
 _LOGGER = logging.getLogger(__name__)
 
-DEPENDENCIES = []
-DOMAIN = 'weather'
-
-ENTITY_ID_FORMAT = DOMAIN + '.{}'
-
 ATTR_CONDITION_CLASS = 'condition_class'
 ATTR_FORECAST = 'forecast'
 ATTR_FORECAST_CONDITION = 'condition'
@@ -26,8 +22,8 @@ ATTR_FORECAST_PRECIPITATION = 'precipitation'
 ATTR_FORECAST_TEMP = 'temperature'
 ATTR_FORECAST_TEMP_LOW = 'templow'
 ATTR_FORECAST_TIME = 'datetime'
-ATTR_FORECAST_WIND_SPEED = 'wind_speed'
 ATTR_FORECAST_WIND_BEARING = 'wind_bearing'
+ATTR_FORECAST_WIND_SPEED = 'wind_speed'
 ATTR_WEATHER_ATTRIBUTION = 'attribution'
 ATTR_WEATHER_HUMIDITY = 'humidity'
 ATTR_WEATHER_OZONE = 'ozone'
@@ -37,10 +33,17 @@ ATTR_WEATHER_VISIBILITY = 'visibility'
 ATTR_WEATHER_WIND_BEARING = 'wind_bearing'
 ATTR_WEATHER_WIND_SPEED = 'wind_speed'
 
+DOMAIN = 'weather'
+
+ENTITY_ID_FORMAT = DOMAIN + '.{}'
+
+SCAN_INTERVAL = timedelta(seconds=30)
+
 
 async def async_setup(hass, config):
     """Set up the weather component."""
-    component = hass.data[DOMAIN] = EntityComponent(_LOGGER, DOMAIN, hass)
+    component = hass.data[DOMAIN] = EntityComponent(
+        _LOGGER, DOMAIN, hass, SCAN_INTERVAL)
     await component.async_setup(config)
     return True
 
diff --git a/homeassistant/components/weather/ipma.py b/homeassistant/components/weather/ipma.py
index 55a1527db8c..a2f5058ac1e 100644
--- a/homeassistant/components/weather/ipma.py
+++ b/homeassistant/components/weather/ipma.py
@@ -92,7 +92,12 @@ class IPMAWeather(WeatherEntity):
     async def async_update(self):
         """Update Condition and Forecast."""
         with async_timeout.timeout(10, loop=self.hass.loop):
-            self._condition = await self._station.observation()
+            _new_condition = await self._station.observation()
+            if _new_condition is None:
+                _LOGGER.warning("Could not update weather conditions")
+                return
+            self._condition = _new_condition
+
             _LOGGER.debug("Updating station %s, condition %s",
                           self._station.local, self._condition)
             self._forecast = await self._station.forecast()
diff --git a/homeassistant/components/weather/openweathermap.py b/homeassistant/components/weather/openweathermap.py
index 0e3a6f90b70..2b86359361a 100644
--- a/homeassistant/components/weather/openweathermap.py
+++ b/homeassistant/components/weather/openweathermap.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
 import homeassistant.helpers.config_validation as cv
 from homeassistant.util import Throttle
 
-REQUIREMENTS = ['pyowm==2.9.0']
+REQUIREMENTS = ['pyowm==2.10.0']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/components/weather/smhi.py b/homeassistant/components/weather/smhi.py
index c686b5c90e9..94873b03bd6 100644
--- a/homeassistant/components/weather/smhi.py
+++ b/homeassistant/components/weather/smhi.py
@@ -96,6 +96,11 @@ class SmhiWeather(WeatherEntity):
         self._fail_count = 0
         self._smhi_api = Smhi(self._longitude, self._latitude, session=session)
 
+    @property
+    def unique_id(self) -> str:
+        """Return a unique id."""
+        return '{}, {}'.format(self._latitude, self._longitude)
+
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     async def async_update(self) -> None:
         """Refresh the forecast data from SMHI weather API."""
diff --git a/homeassistant/components/websocket_api/__init__.py b/homeassistant/components/websocket_api/__init__.py
index 90c802423ce..9c67af820f4 100644
--- a/homeassistant/components/websocket_api/__init__.py
+++ b/homeassistant/components/websocket_api/__init__.py
@@ -20,7 +20,7 @@ BASE_COMMAND_MESSAGE_SCHEMA = messages.BASE_COMMAND_MESSAGE_SCHEMA
 error_message = messages.error_message
 result_message = messages.result_message
 async_response = decorators.async_response
-require_owner = decorators.require_owner
+require_admin = decorators.require_admin
 ws_require_user = decorators.ws_require_user
 # pylint: enable=invalid-name
 
diff --git a/homeassistant/components/websocket_api/auth.py b/homeassistant/components/websocket_api/auth.py
index 434775c9b9b..f175327bf28 100644
--- a/homeassistant/components/websocket_api/auth.py
+++ b/homeassistant/components/websocket_api/auth.py
@@ -6,6 +6,7 @@ from homeassistant.const import __version__
 from homeassistant.components.http.auth import validate_password
 from homeassistant.components.http.ban import process_wrong_login, \
     process_success_login
+from homeassistant.auth.providers import legacy_api_password
 
 from .connection import ActiveConnection
 from .error import Disconnect
@@ -81,7 +82,8 @@ class AuthPhase:
         elif self._hass.auth.support_legacy and 'api_password' in msg:
             self._logger.debug("Received api_password")
             if validate_password(self._request, msg['api_password']):
-                return await self._async_finish_auth(None, None)
+                user = await legacy_api_password.async_get_user(self._hass)
+                return await self._async_finish_auth(user, None)
 
         self._send_message(auth_invalid_message(
             'Invalid access token or password'))
diff --git a/homeassistant/components/websocket_api/decorators.py b/homeassistant/components/websocket_api/decorators.py
index 34250202a5e..d91b884541d 100644
--- a/homeassistant/components/websocket_api/decorators.py
+++ b/homeassistant/components/websocket_api/decorators.py
@@ -3,6 +3,7 @@ from functools import wraps
 import logging
 
 from homeassistant.core import callback
+from homeassistant.exceptions import Unauthorized
 
 from . import messages
 
@@ -30,21 +31,19 @@ def async_response(func):
     return schedule_handler
 
 
-def require_owner(func):
-    """Websocket decorator to require user to be an owner."""
+def require_admin(func):
+    """Websocket decorator to require user to be an admin."""
     @wraps(func)
-    def with_owner(hass, connection, msg):
-        """Check owner and call function."""
+    def with_admin(hass, connection, msg):
+        """Check admin and call function."""
         user = connection.user
 
-        if user is None or not user.is_owner:
-            connection.send_message(messages.error_message(
-                msg['id'], 'unauthorized', 'This command is for owners only.'))
-            return
+        if user is None or not user.is_admin:
+            raise Unauthorized()
 
         func(hass, connection, msg)
 
-    return with_owner
+    return with_admin
 
 
 def ws_require_user(
diff --git a/homeassistant/components/wemo.py b/homeassistant/components/wemo.py
index 1d0133739c3..b80ddb017ce 100644
--- a/homeassistant/components/wemo.py
+++ b/homeassistant/components/wemo.py
@@ -10,17 +10,18 @@ import requests
 import voluptuous as vol
 
 from homeassistant.components.discovery import SERVICE_WEMO
-from homeassistant.helpers import discovery
 from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers import discovery
 
-from homeassistant.const import EVENT_HOMEASSISTANT_STOP
+from homeassistant.const import (
+    EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP)
 
-REQUIREMENTS = ['pywemo==0.4.33']
+REQUIREMENTS = ['pywemo==0.4.34']
 
 DOMAIN = 'wemo'
 
-# Mapping from Wemo model_name to component.
-WEMO_MODEL_DISPATCH = {
+# Mapping from Wemo device type to Home Assistant component type.
+WEMO_DEVICE_TYPE_DISPATCH = {
     'Bridge':  'light',
     'CoffeeMaker': 'switch',
     'Dimmer': 'light',
@@ -29,8 +30,7 @@ WEMO_MODEL_DISPATCH = {
     'LightSwitch': 'switch',
     'Maker':   'switch',
     'Motion': 'binary_sensor',
-    'Sensor':  'binary_sensor',
-    'Socket':  'switch'
+    'Switch':  'switch'
 }
 
 SUBSCRIPTION_REGISTRY = None
@@ -77,36 +77,21 @@ def setup(hass, config):
     """Set up for WeMo devices."""
     import pywemo
 
+    # Keep track of WeMo devices
+    devices = []
+
+    # Keep track of WeMo device subscriptions for push updates
     global SUBSCRIPTION_REGISTRY
     SUBSCRIPTION_REGISTRY = pywemo.SubscriptionRegistry()
     SUBSCRIPTION_REGISTRY.start()
 
     def stop_wemo(event):
         """Shutdown Wemo subscriptions and subscription thread on exit."""
-        _LOGGER.debug("Shutting down subscriptions.")
+        _LOGGER.debug("Shutting down WeMo event subscriptions")
         SUBSCRIPTION_REGISTRY.stop()
 
     hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, stop_wemo)
 
-    def discovery_dispatch(service, discovery_info):
-        """Dispatcher for WeMo discovery events."""
-        # name, model, location, mac
-        model_name = discovery_info.get('model_name')
-        serial = discovery_info.get('serial')
-
-        # Only register a device once
-        if serial in KNOWN_DEVICES:
-            return
-        _LOGGER.debug('Discovered unique device %s', serial)
-        KNOWN_DEVICES.append(serial)
-
-        component = WEMO_MODEL_DISPATCH.get(model_name, 'switch')
-
-        discovery.load_platform(hass, component, DOMAIN, discovery_info,
-                                config)
-
-    discovery.listen(hass, SERVICE_WEMO, discovery_dispatch)
-
     def setup_url_for_device(device):
         """Determine setup.xml url for given device."""
         return 'http://{}:{}/setup.xml'.format(device.host, device.port)
@@ -121,41 +106,76 @@ def setup(hass, config):
 
         return 'http://{}:{}/setup.xml'.format(host, port)
 
-    devices = []
+    def discovery_dispatch(service, discovery_info):
+        """Dispatcher for incoming WeMo discovery events."""
+        # name, model, location, mac
+        device_type = discovery_info.get('device_type')
+        serial = discovery_info.get('serial')
 
-    for host, port in config.get(DOMAIN, {}).get(CONF_STATIC, []):
-        url = setup_url_for_address(host, port)
+        # Only register a device once
+        if serial in KNOWN_DEVICES:
+            _LOGGER.debug('Ignoring known device %s %s',
+                          service, discovery_info)
+            return
 
-        if not url:
-            _LOGGER.error(
-                'Unable to get description url for %s',
-                '{}:{}'.format(host, port) if port else host)
-            continue
+        _LOGGER.debug('Discovered unique WeMo device: %s', serial)
+        KNOWN_DEVICES.append(serial)
 
-        try:
-            device = pywemo.discovery.device_from_description(url, None)
-        except (requests.exceptions.ConnectionError,
-                requests.exceptions.Timeout) as err:
-            _LOGGER.error('Unable to access %s (%s)', url, err)
-            continue
+        component = WEMO_DEVICE_TYPE_DISPATCH.get(device_type, 'switch')
 
-        devices.append((url, device))
+        discovery.load_platform(hass, component, DOMAIN,
+                                discovery_info, config)
 
-    if config.get(DOMAIN, {}).get(CONF_DISCOVERY):
-        _LOGGER.debug("Scanning for WeMo devices.")
-        devices.extend(
-            (setup_url_for_device(device), device)
-            for device in pywemo.discover_devices())
+    discovery.listen(hass, SERVICE_WEMO, discovery_dispatch)
 
-    for url, device in devices:
-        _LOGGER.debug('Adding wemo at %s:%i', device.host, device.port)
+    def discover_wemo_devices(now):
+        """Run discovery for WeMo devices."""
+        _LOGGER.debug("Beginning WeMo device discovery...")
+        _LOGGER.debug("Adding statically configured WeMo devices...")
+        for host, port in config.get(DOMAIN, {}).get(CONF_STATIC, []):
+            url = setup_url_for_address(host, port)
 
-        discovery_info = {
-            'model_name': device.model_name,
-            'serial': device.serialnumber,
-            'mac_address': device.mac,
-            'ssdp_description': url,
-        }
+            if not url:
+                _LOGGER.error(
+                    'Unable to get description url for WeMo at: %s',
+                    '{}:{}'.format(host, port) if port else host)
+                continue
+
+            try:
+                device = pywemo.discovery.device_from_description(url, None)
+            except (requests.exceptions.ConnectionError,
+                    requests.exceptions.Timeout) as err:
+                _LOGGER.error('Unable to access WeMo at %s (%s)', url, err)
+                continue
+
+            if not [d[1] for d in devices
+                    if d[1].serialnumber == device.serialnumber]:
+                devices.append((url, device))
+
+        if config.get(DOMAIN, {}).get(CONF_DISCOVERY):
+            _LOGGER.debug("Scanning network for WeMo devices...")
+            for device in pywemo.discover_devices():
+                if not [d[1] for d in devices
+                        if d[1].serialnumber == device.serialnumber]:
+                    devices.append((setup_url_for_device(device),
+                                    device))
+
+        for url, device in devices:
+            _LOGGER.debug('Adding WeMo device at %s:%i',
+                          device.host, device.port)
+
+            discovery_info = {
+                'device_type': device.__class__.__name__,
+                'serial': device.serialnumber,
+                'mac_address': device.mac,
+                'ssdp_description': url,
+            }
+
+            discovery.discover(hass, SERVICE_WEMO, discovery_info)
+
+        _LOGGER.debug("WeMo device discovery has finished")
+
+    hass.bus.listen_once(EVENT_HOMEASSISTANT_START,
+                         discover_wemo_devices)
 
-        discovery.discover(hass, SERVICE_WEMO, discovery_info)
     return True
diff --git a/homeassistant/components/xiaomi_aqara.py b/homeassistant/components/xiaomi_aqara.py
index aa2102ca805..25e7a72db90 100644
--- a/homeassistant/components/xiaomi_aqara.py
+++ b/homeassistant/components/xiaomi_aqara.py
@@ -20,7 +20,6 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.util.dt import utcnow
-from homeassistant.util import slugify
 
 REQUIREMENTS = ['PyXiaomiGateway==0.11.1']
 
@@ -222,11 +221,11 @@ class XiaomiDevice(Entity):
 
         if hasattr(self, '_data_key') \
                 and self._data_key:  # pylint: disable=no-member
-            self._unique_id = slugify("{}-{}".format(
+            self._unique_id = "{}{}".format(
                 self._data_key,  # pylint: disable=no-member
-                self._sid))
+                self._sid)
         else:
-            self._unique_id = slugify("{}-{}".format(self._type, self._sid))
+            self._unique_id = "{}{}".format(self._type, self._sid)
 
     def _add_push_data_job(self, *args):
         self.hass.add_job(self.push_data, *args)
diff --git a/homeassistant/components/zha/.translations/ca.json b/homeassistant/components/zha/.translations/ca.json
index 1feac454c45..635d0ecbde2 100644
--- a/homeassistant/components/zha/.translations/ca.json
+++ b/homeassistant/components/zha/.translations/ca.json
@@ -4,13 +4,13 @@
             "single_instance_allowed": "Nom\u00e9s es permet una \u00fanica configuraci\u00f3 de ZHA."
         },
         "error": {
-            "cannot_connect": "No es pot connectar amb el dispositiu ZHA."
+            "cannot_connect": "No s'ha pogut connectar amb el dispositiu ZHA."
         },
         "step": {
             "user": {
                 "data": {
                     "radio_type": "Tipus de r\u00e0dio",
-                    "usb_path": "Ruta del port USB amb el dispositiu"
+                    "usb_path": "Ruta del port USB al dispositiu"
                 },
                 "title": "ZHA"
             }
diff --git a/homeassistant/components/zha/.translations/hu.json b/homeassistant/components/zha/.translations/hu.json
new file mode 100644
index 00000000000..11b2a9fc833
--- /dev/null
+++ b/homeassistant/components/zha/.translations/hu.json
@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Csak egyetlen ZHA konfigur\u00e1ci\u00f3 megengedett."
+        },
+        "error": {
+            "cannot_connect": "Nem lehet csatlakozni a ZHA eszk\u00f6zh\u00f6z."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "radio_type": "R\u00e1di\u00f3 t\u00edpusa",
+                    "usb_path": "USB eszk\u00f6z el\u00e9r\u00e9si \u00fat"
+                },
+                "title": "ZHA"
+            }
+        },
+        "title": "ZHA"
+    }
+}
\ No newline at end of file
diff --git a/homeassistant/components/zha/__init__.py b/homeassistant/components/zha/__init__.py
index fb909b6fedf..5ad06565b00 100644
--- a/homeassistant/components/zha/__init__.py
+++ b/homeassistant/components/zha/__init__.py
@@ -7,6 +7,7 @@ https://home-assistant.io/components/zha/
 import collections
 import logging
 import os
+import types
 
 import voluptuous as vol
 
@@ -20,17 +21,20 @@ from homeassistant.helpers.entity_component import EntityComponent
 # Loading the config flow file will register the flow
 from . import config_flow  # noqa  # pylint: disable=unused-import
 from . import const as zha_const
+from .event import ZhaEvent
 from .const import (
     COMPONENTS, CONF_BAUDRATE, CONF_DATABASE, CONF_DEVICE_CONFIG,
     CONF_RADIO_TYPE, CONF_USB_PATH, DATA_ZHA, DATA_ZHA_BRIDGE_ID,
     DATA_ZHA_CONFIG, DATA_ZHA_CORE_COMPONENT, DATA_ZHA_DISPATCHERS,
     DATA_ZHA_RADIO, DEFAULT_BAUDRATE, DEFAULT_DATABASE_NAME,
-    DEFAULT_RADIO_TYPE, DOMAIN, ZHA_DISCOVERY_NEW, RadioType)
+    DEFAULT_RADIO_TYPE, DOMAIN, ZHA_DISCOVERY_NEW, RadioType,
+    EVENTABLE_CLUSTERS, DATA_ZHA_CORE_EVENTS, ENABLE_QUIRKS)
 
 REQUIREMENTS = [
     'bellows==0.7.0',
     'zigpy==0.2.0',
     'zigpy-xbee==0.1.1',
+    'zha-quirks==0.0.5'
 ]
 
 DEVICE_CONFIG_SCHEMA_ENTRY = vol.Schema({
@@ -48,6 +52,7 @@ CONFIG_SCHEMA = vol.Schema({
         vol.Optional(CONF_DATABASE): cv.string,
         vol.Optional(CONF_DEVICE_CONFIG, default={}):
             vol.Schema({cv.string: DEVICE_CONFIG_SCHEMA_ENTRY}),
+        vol.Optional(ENABLE_QUIRKS, default=True): cv.boolean,
     })
 }, extra=vol.ALLOW_EXTRA)
 
@@ -71,7 +76,6 @@ SERVICE_SCHEMAS = {
 CENTICELSIUS = 'C-100'
 
 # Internal definitions
-APPLICATION_CONTROLLER = None
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -91,7 +95,8 @@ async def async_setup(hass, config):
             context={'source': config_entries.SOURCE_IMPORT},
             data={
                 CONF_USB_PATH: conf[CONF_USB_PATH],
-                CONF_RADIO_TYPE: conf.get(CONF_RADIO_TYPE).value
+                CONF_RADIO_TYPE: conf.get(CONF_RADIO_TYPE).value,
+                ENABLE_QUIRKS: conf[ENABLE_QUIRKS]
             }
         ))
     return True
@@ -102,7 +107,11 @@ async def async_setup_entry(hass, config_entry):
 
     Will automatically load components to support devices found on the network.
     """
-    global APPLICATION_CONTROLLER
+    if config_entry.data.get(ENABLE_QUIRKS):
+        # needs to be done here so that the ZHA module is finished loading
+        # before zhaquirks is imported
+        # pylint: disable=W0611, W0612
+        import zhaquirks  # noqa
 
     hass.data[DATA_ZHA] = hass.data.get(DATA_ZHA, {})
     hass.data[DATA_ZHA][DATA_ZHA_DISPATCHERS] = []
@@ -130,12 +139,25 @@ async def async_setup_entry(hass, config_entry):
         database = config[CONF_DATABASE]
     else:
         database = os.path.join(hass.config.config_dir, DEFAULT_DATABASE_NAME)
-    APPLICATION_CONTROLLER = ControllerApplication(radio, database)
-    listener = ApplicationListener(hass, config)
-    APPLICATION_CONTROLLER.add_listener(listener)
-    await APPLICATION_CONTROLLER.startup(auto_form=True)
 
-    for device in APPLICATION_CONTROLLER.devices.values():
+    # patch zigpy listener to prevent flooding logs with warnings due to
+    # how zigpy implemented its listeners
+    from zigpy.appdb import ClusterPersistingListener
+
+    def zha_send_event(self, cluster, command, args):
+        pass
+
+    ClusterPersistingListener.zha_send_event = types.MethodType(
+        zha_send_event,
+        ClusterPersistingListener
+    )
+
+    application_controller = ControllerApplication(radio, database)
+    listener = ApplicationListener(hass, config)
+    application_controller.add_listener(listener)
+    await application_controller.startup(auto_form=True)
+
+    for device in application_controller.devices.values():
         hass.async_create_task(
             listener.async_device_initialized(device, False))
 
@@ -143,14 +165,14 @@ async def async_setup_entry(hass, config_entry):
         hass.helpers.device_registry.async_get_registry()
     device_registry.async_get_or_create(
         config_entry_id=config_entry.entry_id,
-        connections={(CONNECTION_ZIGBEE, str(APPLICATION_CONTROLLER.ieee))},
-        identifiers={(DOMAIN, str(APPLICATION_CONTROLLER.ieee))},
+        connections={(CONNECTION_ZIGBEE, str(application_controller.ieee))},
+        identifiers={(DOMAIN, str(application_controller.ieee))},
         name="Zigbee Coordinator",
         manufacturer="ZHA",
         model=radio_description,
     )
 
-    hass.data[DATA_ZHA][DATA_ZHA_BRIDGE_ID] = str(APPLICATION_CONTROLLER.ieee)
+    hass.data[DATA_ZHA][DATA_ZHA_BRIDGE_ID] = str(application_controller.ieee)
 
     for component in COMPONENTS:
         hass.async_create_task(
@@ -162,7 +184,7 @@ async def async_setup_entry(hass, config_entry):
         """Allow devices to join this network."""
         duration = service.data.get(ATTR_DURATION)
         _LOGGER.info("Permitting joins for %ss", duration)
-        await APPLICATION_CONTROLLER.permit(duration)
+        await application_controller.permit(duration)
 
     hass.services.async_register(DOMAIN, SERVICE_PERMIT, permit,
                                  schema=SERVICE_SCHEMAS[SERVICE_PERMIT])
@@ -173,7 +195,7 @@ async def async_setup_entry(hass, config_entry):
         ieee = service.data.get(ATTR_IEEE)
         ieee = EmberEUI64([uint8_t(p, base=16) for p in ieee.split(':')])
         _LOGGER.info("Removing node %s", ieee)
-        await APPLICATION_CONTROLLER.remove(ieee)
+        await application_controller.remove(ieee)
 
     hass.services.async_register(DOMAIN, SERVICE_REMOVE, remove,
                                  schema=SERVICE_SCHEMAS[SERVICE_REMOVE])
@@ -205,6 +227,9 @@ async def async_unload_entry(hass, config_entry):
     for entity_id in entity_ids:
         await component.async_remove_entity(entity_id)
 
+    # clean up events
+    hass.data[DATA_ZHA][DATA_ZHA_CORE_EVENTS].clear()
+
     _LOGGER.debug("Closing zha radio")
     hass.data[DATA_ZHA][DATA_ZHA_RADIO].close()
 
@@ -221,6 +246,7 @@ class ApplicationListener:
         self._config = config
         self._component = EntityComponent(_LOGGER, DOMAIN, hass)
         self._device_registry = collections.defaultdict(list)
+        self._events = {}
         zha_const.populate_data()
 
         for component in COMPONENTS:
@@ -228,6 +254,7 @@ class ApplicationListener:
                 hass.data[DATA_ZHA].get(component, {})
             )
         hass.data[DATA_ZHA][DATA_ZHA_CORE_COMPONENT] = self._component
+        hass.data[DATA_ZHA][DATA_ZHA_CORE_EVENTS] = self._events
 
     def device_joined(self, device):
         """Handle device joined.
@@ -256,6 +283,8 @@ class ApplicationListener:
         """Handle device being removed from the network."""
         for device_entity in self._device_registry[device.ieee]:
             self._hass.async_create_task(device_entity.async_remove())
+        if device.ieee in self._events:
+            self._events.pop(device.ieee)
 
     async def async_device_initialized(self, device, join):
         """Handle device joined and basic information discovered (async)."""
@@ -362,6 +391,14 @@ class ApplicationListener:
                                              device_classes, discovery_attr,
                                              is_new_join):
         """Try to set up an entity from a "bare" cluster."""
+        if cluster.cluster_id in EVENTABLE_CLUSTERS:
+            if cluster.endpoint.device.ieee not in self._events:
+                self._events.update({cluster.endpoint.device.ieee: []})
+            self._events[cluster.endpoint.device.ieee].append(ZhaEvent(
+                self._hass,
+                cluster
+            ))
+
         if cluster.cluster_id in profile_clusters:
             return
 
diff --git a/homeassistant/components/zha/const.py b/homeassistant/components/zha/const.py
index 9efa847b50c..3e7f9f89f91 100644
--- a/homeassistant/components/zha/const.py
+++ b/homeassistant/components/zha/const.py
@@ -13,6 +13,7 @@ DATA_ZHA_BRIDGE_ID = 'zha_bridge_id'
 DATA_ZHA_RADIO = 'zha_radio'
 DATA_ZHA_DISPATCHERS = 'zha_dispatchers'
 DATA_ZHA_CORE_COMPONENT = 'zha_core_component'
+DATA_ZHA_CORE_EVENTS = 'zha_core_events'
 ZHA_DISCOVERY_NEW = 'zha_discovery_new_{}'
 
 COMPONENTS = [
@@ -29,6 +30,7 @@ CONF_DEVICE_CONFIG = 'device_config'
 CONF_RADIO_TYPE = 'radio_type'
 CONF_USB_PATH = 'usb_path'
 DATA_DEVICE_CONFIG = 'zha_device_config'
+ENABLE_QUIRKS = 'enable_quirks'
 
 DEFAULT_RADIO_TYPE = 'ezsp'
 DEFAULT_BAUDRATE = 57600
@@ -53,6 +55,28 @@ SINGLE_INPUT_CLUSTER_DEVICE_CLASS = {}
 SINGLE_OUTPUT_CLUSTER_DEVICE_CLASS = {}
 CUSTOM_CLUSTER_MAPPINGS = {}
 COMPONENT_CLUSTERS = {}
+EVENTABLE_CLUSTERS = []
+
+REPORT_CONFIG_MAX_INT = 900
+REPORT_CONFIG_MAX_INT_BATTERY_SAVE = 10800
+REPORT_CONFIG_MIN_INT = 30
+REPORT_CONFIG_MIN_INT_ASAP = 1
+REPORT_CONFIG_MIN_INT_IMMEDIATE = 0
+REPORT_CONFIG_MIN_INT_OP = 5
+REPORT_CONFIG_MIN_INT_BATTERY_SAVE = 3600
+REPORT_CONFIG_RPT_CHANGE = 1
+REPORT_CONFIG_DEFAULT = (REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT,
+                         REPORT_CONFIG_RPT_CHANGE)
+REPORT_CONFIG_ASAP = (REPORT_CONFIG_MIN_INT_ASAP, REPORT_CONFIG_MAX_INT,
+                      REPORT_CONFIG_RPT_CHANGE)
+REPORT_CONFIG_BATTERY_SAVE = (REPORT_CONFIG_MIN_INT_BATTERY_SAVE,
+                              REPORT_CONFIG_MAX_INT,
+                              REPORT_CONFIG_RPT_CHANGE)
+REPORT_CONFIG_IMMEDIATE = (REPORT_CONFIG_MIN_INT_IMMEDIATE,
+                           REPORT_CONFIG_MAX_INT,
+                           REPORT_CONFIG_RPT_CHANGE)
+REPORT_CONFIG_OP = (REPORT_CONFIG_MIN_INT_OP, REPORT_CONFIG_MAX_INT,
+                    REPORT_CONFIG_RPT_CHANGE)
 
 
 def populate_data():
@@ -70,6 +94,11 @@ def populate_data():
     if zll.PROFILE_ID not in DEVICE_CLASS:
         DEVICE_CLASS[zll.PROFILE_ID] = {}
 
+    EVENTABLE_CLUSTERS.append(zcl.clusters.general.AnalogInput.cluster_id)
+    EVENTABLE_CLUSTERS.append(zcl.clusters.general.LevelControl.cluster_id)
+    EVENTABLE_CLUSTERS.append(zcl.clusters.general.MultistateInput.cluster_id)
+    EVENTABLE_CLUSTERS.append(zcl.clusters.general.OnOff.cluster_id)
+
     DEVICE_CLASS[zha.PROFILE_ID].update({
         zha.DeviceType.ON_OFF_SWITCH: 'binary_sensor',
         zha.DeviceType.LEVEL_CONTROL_SWITCH: 'binary_sensor',
@@ -107,7 +136,9 @@ def populate_data():
         zcl.clusters.measurement.IlluminanceMeasurement: 'sensor',
         zcl.clusters.smartenergy.Metering: 'sensor',
         zcl.clusters.homeautomation.ElectricalMeasurement: 'sensor',
+        zcl.clusters.general.PowerConfiguration: 'sensor',
         zcl.clusters.security.IasZone: 'binary_sensor',
+        zcl.clusters.measurement.OccupancySensing: 'binary_sensor',
         zcl.clusters.hvac.Fan: 'fan',
     })
     SINGLE_OUTPUT_CLUSTER_DEVICE_CLASS.update({
diff --git a/homeassistant/components/zha/entities/entity.py b/homeassistant/components/zha/entities/entity.py
index 25b98255048..dadd79e82a5 100644
--- a/homeassistant/components/zha/entities/entity.py
+++ b/homeassistant/components/zha/entities/entity.py
@@ -4,13 +4,20 @@ Entity for Zigbee Home Automation.
 For more details about this component, please refer to the documentation at
 https://home-assistant.io/components/zha/
 """
+import asyncio
+import logging
+from random import uniform
+
 from homeassistant.components.zha.const import (
     DATA_ZHA, DATA_ZHA_BRIDGE_ID, DOMAIN)
+from homeassistant.components.zha.helpers import bind_configure_reporting
 from homeassistant.core import callback
 from homeassistant.helpers import entity
 from homeassistant.helpers.device_registry import CONNECTION_ZIGBEE
 from homeassistant.util import slugify
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class ZhaEntity(entity.Entity):
     """A base class for ZHA entities."""
@@ -18,7 +25,8 @@ class ZhaEntity(entity.Entity):
     _domain = None  # Must be overridden by subclasses
 
     def __init__(self, endpoint, in_clusters, out_clusters, manufacturer,
-                 model, application_listener, unique_id, **kwargs):
+                 model, application_listener, unique_id, new_join=False,
+                 **kwargs):
         """Init ZHA entity."""
         self._device_state_attributes = {}
         ieee = endpoint.device.ieee
@@ -47,6 +55,7 @@ class ZhaEntity(entity.Entity):
         self._endpoint = endpoint
         self._in_clusters = in_clusters
         self._out_clusters = out_clusters
+        self._new_join = new_join
         self._state = None
         self._unique_id = unique_id
 
@@ -57,6 +66,7 @@ class ZhaEntity(entity.Entity):
         self._out_listeners = {}
 
         self._initialized = False
+        self.manufacturer_code = None
         application_listener.register_entity(ieee, self)
 
     async def async_added_to_hass(self):
@@ -69,8 +79,86 @@ class ZhaEntity(entity.Entity):
         for cluster_id, cluster in self._out_clusters.items():
             cluster.add_listener(self._out_listeners.get(cluster_id, self))
 
+        self._endpoint.device.zdo.add_listener(self)
+
+        if self._new_join:
+            self.hass.async_create_task(self.async_configure())
+
         self._initialized = True
 
+    async def async_configure(self):
+        """Set cluster binding and attribute reporting."""
+        for cluster_key, attrs in self.zcl_reporting_config.items():
+            cluster = self._get_cluster_from_report_config(cluster_key)
+            if cluster is None:
+                continue
+
+            manufacturer = None
+            if cluster.cluster_id >= 0xfc00 and self.manufacturer_code:
+                manufacturer = self.manufacturer_code
+
+            skip_bind = False  # bind cluster only for the 1st configured attr
+            for attr, details in attrs.items():
+                min_report_interval, max_report_interval, change = details
+                await bind_configure_reporting(
+                    self.entity_id, cluster, attr,
+                    min_report=min_report_interval,
+                    max_report=max_report_interval,
+                    reportable_change=change,
+                    skip_bind=skip_bind,
+                    manufacturer=manufacturer
+                )
+                skip_bind = True
+                await asyncio.sleep(uniform(0.1, 0.5))
+        _LOGGER.debug("%s: finished configuration", self.entity_id)
+
+    def _get_cluster_from_report_config(self, cluster_key):
+        """Parse an entry from zcl_reporting_config dict."""
+        from zigpy.zcl import Cluster as Zcl_Cluster
+
+        cluster = None
+        if isinstance(cluster_key, Zcl_Cluster):
+            cluster = cluster_key
+        elif isinstance(cluster_key, str):
+            cluster = getattr(self._endpoint, cluster_key, None)
+        elif isinstance(cluster_key, int):
+            if cluster_key in self._in_clusters:
+                cluster = self._in_clusters[cluster_key]
+            elif cluster_key in self._out_clusters:
+                cluster = self._out_clusters[cluster_key]
+        elif issubclass(cluster_key, Zcl_Cluster):
+            cluster_id = cluster_key.cluster_id
+            if cluster_id in self._in_clusters:
+                cluster = self._in_clusters[cluster_id]
+            elif cluster_id in self._out_clusters:
+                cluster = self._out_clusters[cluster_id]
+        return cluster
+
+    @property
+    def zcl_reporting_config(self):
+        """Return a dict of ZCL attribute reporting configuration.
+
+        {
+            Cluster_Class: {
+                attr_id: (min_report_interval, max_report_interval, change),
+                attr_name: (min_rep_interval, max_rep_interval, change)
+            }
+            Cluster_Instance: {
+                attr_id: (min_report_interval, max_report_interval, change),
+                attr_name: (min_rep_interval, max_rep_interval, change)
+            }
+            cluster_id: {
+                attr_id: (min_report_interval, max_report_interval, change),
+                attr_name: (min_rep_interval, max_rep_interval, change)
+            }
+            'cluster_name': {
+                attr_id: (min_report_interval, max_report_interval, change),
+                attr_name: (min_rep_interval, max_rep_interval, change)
+            }
+        }
+        """
+        return {}
+
     @property
     def unique_id(self) -> str:
         """Return a unique ID."""
@@ -81,6 +169,11 @@ class ZhaEntity(entity.Entity):
         """Return device specific state attributes."""
         return self._device_state_attributes
 
+    @property
+    def should_poll(self) -> bool:
+        """Let ZHA handle polling."""
+        return False
+
     @callback
     def attribute_updated(self, attribute, value):
         """Handle an attribute updated on this cluster."""
@@ -91,6 +184,16 @@ class ZhaEntity(entity.Entity):
         """Handle a ZDO command received on this cluster."""
         pass
 
+    @callback
+    def device_announce(self, device):
+        """Handle device_announce zdo event."""
+        self.async_schedule_update_ha_state(force_refresh=True)
+
+    @callback
+    def permit_duration(self, permit_duration):
+        """Handle permit_duration zdo event."""
+        pass
+
     @property
     def device_info(self):
         """Return a device description for device registry."""
@@ -103,3 +206,8 @@ class ZhaEntity(entity.Entity):
             'name': self._device_state_attributes.get('friendly_name', ieee),
             'via_hub': (DOMAIN, self.hass.data[DATA_ZHA][DATA_ZHA_BRIDGE_ID]),
         }
+
+    @callback
+    def zha_send_event(self, cluster, command, args):
+        """Relay entity events to hass."""
+        pass  # don't relay events from entities
diff --git a/homeassistant/components/zha/entities/listeners.py b/homeassistant/components/zha/entities/listeners.py
new file mode 100644
index 00000000000..d4fce491563
--- /dev/null
+++ b/homeassistant/components/zha/entities/listeners.py
@@ -0,0 +1,110 @@
+"""
+Cluster listeners for Zigbee Home Automation.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/zha/
+"""
+
+import logging
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def parse_and_log_command(entity_id, cluster, tsn, command_id, args):
+    """Parse and log a zigbee cluster command."""
+    cmd = cluster.server_commands.get(command_id, [command_id])[0]
+    _LOGGER.debug(
+        "%s: received '%s' command with %s args on cluster_id '%s' tsn '%s'",
+        entity_id,
+        cmd,
+        args,
+        cluster.cluster_id,
+        tsn
+    )
+    return cmd
+
+
+class ClusterListener:
+    """Listener for a Zigbee cluster."""
+
+    def __init__(self, entity, cluster):
+        """Initialize ClusterListener."""
+        self._entity = entity
+        self._cluster = cluster
+
+    def cluster_command(self, tsn, command_id, args):
+        """Handle commands received to this cluster."""
+        pass
+
+    def attribute_updated(self, attrid, value):
+        """Handle attribute updates on this cluster."""
+        pass
+
+    def zdo_command(self, *args, **kwargs):
+        """Handle ZDO commands on this cluster."""
+        pass
+
+    def zha_send_event(self, cluster, command, args):
+        """Relay entity events to hass."""
+        pass  # don't let entities fire events
+
+
+class OnOffListener(ClusterListener):
+    """Listener for the OnOff Zigbee cluster."""
+
+    ON_OFF = 0
+
+    def cluster_command(self, tsn, command_id, args):
+        """Handle commands received to this cluster."""
+        cmd = parse_and_log_command(
+            self._entity.entity_id,
+            self._cluster,
+            tsn,
+            command_id,
+            args
+        )
+
+        if cmd in ('off', 'off_with_effect'):
+            self._entity.set_state(False)
+        elif cmd in ('on', 'on_with_recall_global_scene', 'on_with_timed_off'):
+            self._entity.set_state(True)
+        elif cmd == 'toggle':
+            self._entity.set_state(not self._entity.is_on)
+
+    def attribute_updated(self, attrid, value):
+        """Handle attribute updates on this cluster."""
+        if attrid == self.ON_OFF:
+            self._entity.set_state(bool(value))
+
+
+class LevelListener(ClusterListener):
+    """Listener for the LevelControl Zigbee cluster."""
+
+    CURRENT_LEVEL = 0
+
+    def cluster_command(self, tsn, command_id, args):
+        """Handle commands received to this cluster."""
+        cmd = parse_and_log_command(
+            self._entity.entity_id,
+            self._cluster,
+            tsn,
+            command_id,
+            args
+        )
+
+        if cmd in ('move_to_level', 'move_to_level_with_on_off'):
+            self._entity.set_level(args[0])
+        elif cmd in ('move', 'move_with_on_off'):
+            # We should dim slowly -- for now, just step once
+            rate = args[1]
+            if args[0] == 0xff:
+                rate = 10  # Should read default move rate
+            self._entity.move_level(-rate if args[0] else rate)
+        elif cmd in ('step', 'step_with_on_off'):
+            # Step (technically may change on/off)
+            self._entity.move_level(-args[1] if args[0] else args[1])
+
+    def attribute_updated(self, attrid, value):
+        """Handle attribute updates on this cluster."""
+        if attrid == self.CURRENT_LEVEL:
+            self._entity.set_level(value)
diff --git a/homeassistant/components/zha/event.py b/homeassistant/components/zha/event.py
new file mode 100644
index 00000000000..20175dd097f
--- /dev/null
+++ b/homeassistant/components/zha/event.py
@@ -0,0 +1,69 @@
+"""
+Event for Zigbee Home Automation.
+
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/zha/
+"""
+import logging
+
+from homeassistant.core import EventOrigin, callback
+from homeassistant.util import slugify
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class ZhaEvent():
+    """A base class for ZHA events."""
+
+    def __init__(self, hass, cluster, **kwargs):
+        """Init ZHA event."""
+        self._hass = hass
+        self._cluster = cluster
+        cluster.add_listener(self)
+        ieee = cluster.endpoint.device.ieee
+        ieeetail = ''.join(['%02x' % (o, ) for o in ieee[-4:]])
+        endpoint = cluster.endpoint
+        if endpoint.manufacturer and endpoint.model is not None:
+            self._unique_id = "{}.{}_{}_{}_{}{}".format(
+                'zha_event',
+                slugify(endpoint.manufacturer),
+                slugify(endpoint.model),
+                ieeetail,
+                cluster.endpoint.endpoint_id,
+                kwargs.get('entity_suffix', ''),
+            )
+        else:
+            self._unique_id = "{}.zha_{}_{}{}".format(
+                'zha_event',
+                ieeetail,
+                cluster.endpoint.endpoint_id,
+                kwargs.get('entity_suffix', ''),
+            )
+
+    @callback
+    def attribute_updated(self, attribute, value):
+        """Handle an attribute updated on this cluster."""
+        pass
+
+    @callback
+    def zdo_command(self, tsn, command_id, args):
+        """Handle a ZDO command received on this cluster."""
+        pass
+
+    @callback
+    def cluster_command(self, tsn, command_id, args):
+        """Handle a cluster command received on this cluster."""
+        pass
+
+    @callback
+    def zha_send_event(self, cluster, command, args):
+        """Relay entity events to hass."""
+        self._hass.bus.async_fire(
+            'zha_event',
+            {
+                'unique_id': self._unique_id,
+                'command': command,
+                'args': args
+            },
+            EventOrigin.remote
+        )
diff --git a/homeassistant/components/zha/helpers.py b/homeassistant/components/zha/helpers.py
index 7ae6fbf2d22..3212849f721 100644
--- a/homeassistant/components/zha/helpers.py
+++ b/homeassistant/components/zha/helpers.py
@@ -7,7 +7,9 @@ https://home-assistant.io/components/zha/
 import asyncio
 import logging
 
-from .const import DEFAULT_BAUDRATE, RadioType
+from .const import (
+    DEFAULT_BAUDRATE, REPORT_CONFIG_MAX_INT, REPORT_CONFIG_MIN_INT,
+    REPORT_CONFIG_RPT_CHANGE, RadioType)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -30,33 +32,48 @@ async def safe_read(cluster, attributes, allow_cache=True, only_cache=False):
         return {}
 
 
+async def bind_cluster(entity_id, cluster):
+    """Bind a zigbee cluster.
+
+    This also swallows DeliveryError exceptions that are thrown when devices
+    are unreachable.
+    """
+    from zigpy.exceptions import DeliveryError
+
+    cluster_name = cluster.ep_attribute
+    try:
+        res = await cluster.bind()
+        _LOGGER.debug(
+            "%s: bound  '%s' cluster: %s", entity_id, cluster_name, res[0]
+        )
+    except DeliveryError as ex:
+        _LOGGER.debug(
+            "%s: Failed to bind '%s' cluster: %s",
+            entity_id, cluster_name, str(ex)
+        )
+
+
 async def configure_reporting(entity_id, cluster, attr, skip_bind=False,
-                              min_report=300, max_report=900,
-                              reportable_change=1):
+                              min_report=REPORT_CONFIG_MIN_INT,
+                              max_report=REPORT_CONFIG_MAX_INT,
+                              reportable_change=REPORT_CONFIG_RPT_CHANGE,
+                              manufacturer=None):
     """Configure attribute reporting for a cluster.
 
-    while swallowing the DeliverError exceptions in case of unreachable
-    devices.
+    This also swallows DeliveryError exceptions that are thrown when devices
+    are unreachable.
     """
     from zigpy.exceptions import DeliveryError
 
     attr_name = cluster.attributes.get(attr, [attr])[0]
     cluster_name = cluster.ep_attribute
-    if not skip_bind:
-        try:
-            res = await cluster.bind()
-            _LOGGER.debug(
-                "%s: bound  '%s' cluster: %s", entity_id, cluster_name, res[0]
-            )
-        except DeliveryError as ex:
-            _LOGGER.debug(
-                "%s: Failed to bind '%s' cluster: %s",
-                entity_id, cluster_name, str(ex)
-            )
-
+    kwargs = {}
+    if manufacturer:
+        kwargs['manufacturer'] = manufacturer
     try:
         res = await cluster.configure_reporting(attr, min_report,
-                                                max_report, reportable_change)
+                                                max_report, reportable_change,
+                                                **kwargs)
         _LOGGER.debug(
             "%s: reporting '%s' attr on '%s' cluster: %d/%d/%d: Result: '%s'",
             entity_id, attr_name, cluster_name, min_report, max_report,
@@ -69,6 +86,26 @@ async def configure_reporting(entity_id, cluster, attr, skip_bind=False,
         )
 
 
+async def bind_configure_reporting(entity_id, cluster, attr, skip_bind=False,
+                                   min_report=REPORT_CONFIG_MIN_INT,
+                                   max_report=REPORT_CONFIG_MAX_INT,
+                                   reportable_change=REPORT_CONFIG_RPT_CHANGE,
+                                   manufacturer=None):
+    """Bind and configure zigbee attribute reporting for a cluster.
+
+    This also swallows DeliveryError exceptions that are thrown when devices
+    are unreachable.
+    """
+    if not skip_bind:
+        await bind_cluster(entity_id, cluster)
+
+    await configure_reporting(entity_id, cluster, attr, skip_bind=False,
+                              min_report=REPORT_CONFIG_MIN_INT,
+                              max_report=REPORT_CONFIG_MAX_INT,
+                              reportable_change=REPORT_CONFIG_RPT_CHANGE,
+                              manufacturer=None)
+
+
 async def check_zigpy_connection(usb_path, radio_type, database_path):
     """Test zigpy radio connection."""
     if radio_type == RadioType.ezsp.name:
diff --git a/homeassistant/components/zone/.translations/ca.json b/homeassistant/components/zone/.translations/ca.json
index 1676c8f3906..aa8296b92df 100644
--- a/homeassistant/components/zone/.translations/ca.json
+++ b/homeassistant/components/zone/.translations/ca.json
@@ -13,7 +13,7 @@
                     "passive": "Passiu",
                     "radius": "Radi"
                 },
-                "title": "Defineix els par\u00e0metres de la zona"
+                "title": "Definici\u00f3 dels par\u00e0metres de la zona"
             }
         },
         "title": "Zona"
diff --git a/homeassistant/components/zoneminder/__init__.py b/homeassistant/components/zoneminder/__init__.py
index e5d0c7a5a92..8d603d04f59 100644
--- a/homeassistant/components/zoneminder/__init__.py
+++ b/homeassistant/components/zoneminder/__init__.py
@@ -15,7 +15,7 @@ import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
-REQUIREMENTS = ['zm-py==0.1.0']
+REQUIREMENTS = ['zm-py==0.3.0']
 
 CONF_PATH_ZMS = 'path_zms'
 
diff --git a/homeassistant/components/zwave/.translations/ca.json b/homeassistant/components/zwave/.translations/ca.json
index 7849f34bbf9..bbf303a1f5e 100644
--- a/homeassistant/components/zwave/.translations/ca.json
+++ b/homeassistant/components/zwave/.translations/ca.json
@@ -5,16 +5,16 @@
             "one_instance_only": "El component nom\u00e9s admet una inst\u00e0ncia de Z-Wave"
         },
         "error": {
-            "option_error": "Ha fallat la validaci\u00f3 de Z-Wave. \u00c9s correcta la ruta al port USB on hi ha la mem\u00f2ria?"
+            "option_error": "Ha fallat la validaci\u00f3 de Z-Wave. \u00c9s correcta la ruta al port USB on hi ha connectat el dispositiu?"
         },
         "step": {
             "user": {
                 "data": {
-                    "network_key": "Clau de xarxa (deixeu-ho en blanc per generar-la autom\u00e0ticament)",
+                    "network_key": "Clau de xarxa (deixa-ho en blanc per generar-la autom\u00e0ticament)",
                     "usb_path": "Ruta del port USB"
                 },
-                "description": "Consulteu https://www.home-assistant.io/docs/z-wave/installation/ per obtenir informaci\u00f3 sobre les variables de configuraci\u00f3",
-                "title": "Configureu Z-Wave"
+                "description": "Consulta https://www.home-assistant.io/docs/z-wave/installation/ per obtenir informaci\u00f3 sobre les variables de configuraci\u00f3",
+                "title": "Configuraci\u00f3 de Z-Wave"
             }
         },
         "title": "Z-Wave"
diff --git a/homeassistant/components/zwave/.translations/hu.json b/homeassistant/components/zwave/.translations/hu.json
index e2acc5f9115..e326c5152a6 100644
--- a/homeassistant/components/zwave/.translations/hu.json
+++ b/homeassistant/components/zwave/.translations/hu.json
@@ -8,7 +8,9 @@
                 "data": {
                     "network_key": "H\u00e1l\u00f3zati kulcs (hagyja \u00fcresen az automatikus gener\u00e1l\u00e1shoz)",
                     "usb_path": "USB el\u00e9r\u00e9si \u00fat"
-                }
+                },
+                "description": "A konfigur\u00e1ci\u00f3s v\u00e1ltoz\u00f3kr\u00f3l az inform\u00e1ci\u00f3kat l\u00e1sd a https://www.home-assistant.io/docs/z-wave/installation/ oldalon.",
+                "title": "Z-Wave be\u00e1ll\u00edt\u00e1sa"
             }
         },
         "title": "Z-Wave"
diff --git a/homeassistant/components/zwave/__init__.py b/homeassistant/components/zwave/__init__.py
index 6d96192f075..7860b545be2 100644
--- a/homeassistant/components/zwave/__init__.py
+++ b/homeassistant/components/zwave/__init__.py
@@ -42,7 +42,7 @@ from .discovery_schemas import DISCOVERY_SCHEMAS
 from .util import (check_node_schema, check_value_schema, node_name,
                    check_has_unique_id, is_node_parsed)
 
-REQUIREMENTS = ['pydispatcher==2.0.5', 'homeassistant-pyozw==0.1.1']
+REQUIREMENTS = ['pydispatcher==2.0.5', 'homeassistant-pyozw==0.1.2']
 
 _LOGGER = logging.getLogger(__name__)
 
diff --git a/homeassistant/config.py b/homeassistant/config.py
index 4fc77bd81cd..10d3ce21a00 100644
--- a/homeassistant/config.py
+++ b/homeassistant/config.py
@@ -437,9 +437,10 @@ def _format_config_error(ex: vol.Invalid, domain: str, config: Dict) -> str:
     """
     message = "Invalid config for [{}]: ".format(domain)
     if 'extra keys not allowed' in ex.error_message:
-        message += '[{}] is an invalid option for [{}]. Check: {}->{}.'\
-                   .format(ex.path[-1], domain, domain,
-                           '->'.join(str(m) for m in ex.path))
+        message += '[{option}] is an invalid option for [{domain}]. ' \
+            'Check: {domain}->{path}.'.format(
+                option=ex.path[-1], domain=domain,
+                path='->'.join(str(m) for m in ex.path))
     else:
         message += '{}.'.format(humanize_error(config, ex))
 
diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index 5c6ced5756f..2048b4214c6 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -136,16 +136,18 @@ HANDLERS = Registry()
 # Components that have config flows. In future we will auto-generate this list.
 FLOWS = [
     'cast',
+    'daikin',
     'deconz',
     'dialogflow',
+    'esphome',
     'hangouts',
     'homematicip_cloud',
     'hue',
     'ifttt',
     'ios',
     'lifx',
-    'mailgun',
     'luftdaten',
+    'mailgun',
     'mqtt',
     'nest',
     'openuv',
@@ -155,6 +157,7 @@ FLOWS = [
     'simplisafe',
     'smhi',
     'sonos',
+    'tellduslive',
     'tradfri',
     'twilio',
     'unifi',
diff --git a/homeassistant/const.py b/homeassistant/const.py
index ceed012eb9b..eccbb262ec5 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -1,8 +1,8 @@
 # coding: utf-8
 """Constants used by Home Assistant components."""
 MAJOR_VERSION = 0
-MINOR_VERSION = 84
-PATCH_VERSION = '6'
+MINOR_VERSION = 85
+PATCH_VERSION = '0'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
 REQUIRED_PYTHON_VER = (3, 5, 3)
@@ -13,6 +13,9 @@ PLATFORM_FORMAT = '{}.{}'
 # Can be used to specify a catch all when registering state or event listeners.
 MATCH_ALL = '*'
 
+# Entity target all constant
+ENTITY_MATCH_ALL = 'all'
+
 # If no name is specified
 DEVICE_DEFAULT_NAME = 'Unnamed Device'
 
diff --git a/homeassistant/exceptions.py b/homeassistant/exceptions.py
index 5e2ab4988b1..aadee3e792b 100644
--- a/homeassistant/exceptions.py
+++ b/homeassistant/exceptions.py
@@ -47,12 +47,18 @@ class Unauthorized(HomeAssistantError):
     def __init__(self, context: Optional['Context'] = None,
                  user_id: Optional[str] = None,
                  entity_id: Optional[str] = None,
+                 config_entry_id: Optional[str] = None,
+                 perm_category: Optional[str] = None,
                  permission: Optional[Tuple[str]] = None) -> None:
         """Unauthorized error."""
         super().__init__(self.__class__.__name__)
         self.context = context
         self.user_id = user_id
         self.entity_id = entity_id
+        self.config_entry_id = config_entry_id
+        # Not all actions have an ID (like adding config entry)
+        # We then use this fallback to know what category was unauth
+        self.perm_category = perm_category
         self.permission = permission
 
 
diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py
index 5c49a1b50e1..c14f4e4fadb 100644
--- a/homeassistant/helpers/config_validation.py
+++ b/homeassistant/helpers/config_validation.py
@@ -15,7 +15,8 @@ from homeassistant.const import (
     CONF_PLATFORM, CONF_SCAN_INTERVAL, TEMP_CELSIUS, TEMP_FAHRENHEIT,
     CONF_ALIAS, CONF_ENTITY_ID, CONF_VALUE_TEMPLATE, WEEKDAYS,
     CONF_CONDITION, CONF_BELOW, CONF_ABOVE, CONF_TIMEOUT, SUN_EVENT_SUNSET,
-    SUN_EVENT_SUNRISE, CONF_UNIT_SYSTEM_IMPERIAL, CONF_UNIT_SYSTEM_METRIC)
+    SUN_EVENT_SUNRISE, CONF_UNIT_SYSTEM_IMPERIAL, CONF_UNIT_SYSTEM_METRIC,
+    ENTITY_MATCH_ALL)
 from homeassistant.core import valid_entity_id, split_entity_id
 from homeassistant.exceptions import TemplateError
 import homeassistant.util.dt as dt_util
@@ -161,6 +162,12 @@ def entity_ids(value: Union[str, Sequence]) -> Sequence[str]:
     return [entity_id(ent_id) for ent_id in value]
 
 
+comp_entity_ids = vol.Any(
+    vol.All(vol.Lower, ENTITY_MATCH_ALL),
+    entity_ids
+)
+
+
 def entity_domain(domain: str):
     """Validate that entity belong to domain."""
     def validate(value: Any) -> str:
diff --git a/homeassistant/helpers/device_registry.py b/homeassistant/helpers/device_registry.py
index 78d15e57f38..ce3700ea174 100644
--- a/homeassistant/helpers/device_registry.py
+++ b/homeassistant/helpers/device_registry.py
@@ -19,6 +19,7 @@ STORAGE_VERSION = 1
 SAVE_DELAY = 10
 
 CONNECTION_NETWORK_MAC = 'mac'
+CONNECTION_UPNP = 'upnp'
 CONNECTION_ZIGBEE = 'zigbee'
 
 
diff --git a/homeassistant/helpers/entity_component.py b/homeassistant/helpers/entity_component.py
index 982c92510a9..ce876991097 100644
--- a/homeassistant/helpers/entity_component.py
+++ b/homeassistant/helpers/entity_component.py
@@ -7,7 +7,7 @@ import logging
 from homeassistant import config as conf_util
 from homeassistant.setup import async_prepare_setup_platform
 from homeassistant.const import (
-    ATTR_ENTITY_ID, CONF_SCAN_INTERVAL, CONF_ENTITY_NAMESPACE)
+    ATTR_ENTITY_ID, CONF_SCAN_INTERVAL, CONF_ENTITY_NAMESPACE, MATCH_ALL)
 from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_per_platform, discovery
@@ -161,7 +161,15 @@ class EntityComponent:
 
         This method must be run in the event loop.
         """
-        if ATTR_ENTITY_ID not in service.data:
+        data_ent_id = service.data.get(ATTR_ENTITY_ID)
+
+        if data_ent_id in (None, MATCH_ALL):
+            if data_ent_id is None:
+                self.logger.warning(
+                    'Not passing an entity ID to a service to target all '
+                    'entities is deprecated. Update your call to %s.%s to be '
+                    'instead: entity_id: "*"', service.domain, service.service)
+
             return [entity for entity in self.entities if entity.available]
 
         entity_ids = set(extract_entity_ids(self.hass, service, expand_group))
diff --git a/homeassistant/helpers/intent.py b/homeassistant/helpers/intent.py
index d942aabccce..f4d57ce86cd 100644
--- a/homeassistant/helpers/intent.py
+++ b/homeassistant/helpers/intent.py
@@ -68,8 +68,7 @@ async def async_handle(hass: HomeAssistantType, platform: str,
                         intent_type, err)
         raise InvalidSlotInfo(
             'Received invalid slot info for {}'.format(intent_type)) from err
-    # https://github.com/PyCQA/pylint/issues/2284
-    except IntentHandleError:  # pylint: disable=try-except-raise
+    except IntentHandleError:
         raise
     except Exception as err:
         raise IntentUnexpectedError(
diff --git a/homeassistant/helpers/script.py b/homeassistant/helpers/script.py
index 088882df608..e4693c3cd3b 100644
--- a/homeassistant/helpers/script.py
+++ b/homeassistant/helpers/script.py
@@ -85,6 +85,7 @@ class Script():
         self.name = name
         self._change_listener = change_listener
         self._cur = -1
+        self._exception_step = None
         self.last_action = None
         self.last_triggered = None
         self.can_cancel = any(CONF_DELAY in action or CONF_WAIT_TEMPLATE
@@ -136,10 +137,9 @@ class Script():
                 return
             except _StopScript:
                 break
-            except Exception as err:
+            except Exception:
                 # Store the step that had an exception
-                # pylint: disable=protected-access
-                err._script_step = cur
+                self._exception_step = cur
                 # Set script to not running
                 self._cur = -1
                 self.last_action = None
@@ -166,6 +166,44 @@ class Script():
         if self._change_listener:
             self.hass.async_add_job(self._change_listener)
 
+    @callback
+    def async_log_exception(self, logger, message_base, exception):
+        """Log an exception for this script.
+
+        Should only be called on exceptions raised by this scripts async_run.
+        """
+        # pylint: disable=protected-access
+        step = self._exception_step
+        action = self.sequence[step]
+        action_type = _determine_action(action)
+
+        error = None
+        meth = logger.error
+
+        if isinstance(exception, vol.Invalid):
+            error_desc = "Invalid data"
+
+        elif isinstance(exception, exceptions.TemplateError):
+            error_desc = "Error rendering template"
+
+        elif isinstance(exception, exceptions.Unauthorized):
+            error_desc = "Unauthorized"
+
+        elif isinstance(exception, exceptions.ServiceNotFound):
+            error_desc = "Service not found"
+
+        else:
+            # Print the full stack trace, unknown error
+            error_desc = 'Unknown error'
+            meth = logger.exception
+            error = ""
+
+        if error is None:
+            error = str(exception)
+
+        meth("%s. %s for %s at pos %s: %s",
+             message_base, error_desc, action_type, step + 1, error)
+
     async def _handle_action(self, action, variables, context):
         """Handle an action."""
         await self._actions[_determine_action(action)](
diff --git a/homeassistant/helpers/service.py b/homeassistant/helpers/service.py
index e8068f57286..66488fbec3d 100644
--- a/homeassistant/helpers/service.py
+++ b/homeassistant/helpers/service.py
@@ -6,7 +6,7 @@ from os import path
 import voluptuous as vol
 
 from homeassistant.auth.permissions.const import POLICY_CONTROL
-from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.const import ATTR_ENTITY_ID, ENTITY_MATCH_ALL
 import homeassistant.core as ha
 from homeassistant.exceptions import TemplateError, Unauthorized, UnknownUser
 from homeassistant.helpers import template
@@ -55,9 +55,13 @@ async def async_call_from_config(hass, config, blocking=False, variables=None,
                 variables)
             domain_service = cv.service(domain_service)
         except TemplateError as ex:
+            if blocking:
+                raise
             _LOGGER.error('Error rendering service name template: %s', ex)
             return
         except vol.Invalid:
+            if blocking:
+                raise
             _LOGGER.error('Template rendered invalid service: %s',
                           domain_service)
             return
@@ -197,7 +201,12 @@ async def entity_service_call(hass, platforms, func, call):
         entity_perms = None
 
     # Are we trying to target all entities
-    target_all_entities = ATTR_ENTITY_ID not in call.data
+    if ATTR_ENTITY_ID in call.data:
+        target_all_entities = call.data[ATTR_ENTITY_ID] == ENTITY_MATCH_ALL
+    else:
+        _LOGGER.warning('Not passing an entity ID to a service to target all '
+                        'entities is deprecated. Use instead: entity_id: "*"')
+        target_all_entities = True
 
     if not target_all_entities:
         # A set of entities we're trying to target.
diff --git a/homeassistant/helpers/template.py b/homeassistant/helpers/template.py
index 2173f972cba..e82302dfd3b 100644
--- a/homeassistant/helpers/template.py
+++ b/homeassistant/helpers/template.py
@@ -149,7 +149,8 @@ class Template:
             error_value).result()
 
     def async_render_with_possible_json_value(self, value,
-                                              error_value=_SENTINEL):
+                                              error_value=_SENTINEL,
+                                              variables=None):
         """Render template with value exposed.
 
         If valid JSON will expose value_json too.
@@ -159,9 +160,9 @@ class Template:
         if self._compiled is None:
             self._ensure_compiled()
 
-        variables = {
-            'value': value
-        }
+        variables = dict(variables or {})
+        variables['value'] = value
+
         try:
             variables['value_json'] = json.loads(value)
         except ValueError:
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 7236380d42a..b06287bcf17 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -1,18 +1,18 @@
-aiohttp==3.4.4
+aiohttp==3.5.1
 astral==1.7.1
 async_timeout==3.0.1
 attrs==18.2.0
 bcrypt==3.1.4
 certifi>=2018.04.16
-idna==2.7
 jinja2>=2.10
 PyJWT==1.6.4
 cryptography==2.3.1
 pip>=8.0.3
-pytz>=2018.04
+python-slugify==1.2.6
+pytz>=2018.07
 pyyaml>=3.13,<4
-requests==2.20.1
-ruamel.yaml==0.15.80
+requests==2.21.0
+ruamel.yaml==0.15.81
 voluptuous==0.11.5
 voluptuous-serialize==2.0.0
 
diff --git a/homeassistant/scripts/check_config.py b/homeassistant/scripts/check_config.py
index ac341e8f58a..50463c28bd1 100644
--- a/homeassistant/scripts/check_config.py
+++ b/homeassistant/scripts/check_config.py
@@ -21,7 +21,7 @@ from homeassistant.config import (
 from homeassistant.util import yaml
 from homeassistant.exceptions import HomeAssistantError
 
-REQUIREMENTS = ('colorlog==3.1.4',)
+REQUIREMENTS = ('colorlog==4.0.2',)
 if system() == 'Windows':  # Ensure colorama installed for colorlog on Windows
     REQUIREMENTS += ('colorama<=1',)
 
diff --git a/homeassistant/scripts/keyring.py b/homeassistant/scripts/keyring.py
index 16c2638f26e..9837ff64cd5 100644
--- a/homeassistant/scripts/keyring.py
+++ b/homeassistant/scripts/keyring.py
@@ -5,7 +5,7 @@ import os
 
 from homeassistant.util.yaml import _SECRET_NAMESPACE
 
-REQUIREMENTS = ['keyring==17.0.0', 'keyrings.alt==3.1']
+REQUIREMENTS = ['keyring==17.1.0', 'keyrings.alt==3.1.1']
 
 
 def run(args):
diff --git a/homeassistant/util/__init__.py b/homeassistant/util/__init__.py
index 17849154ff7..b4d45b48079 100644
--- a/homeassistant/util/__init__.py
+++ b/homeassistant/util/__init__.py
@@ -10,10 +10,11 @@ import random
 import string
 from functools import wraps
 from types import MappingProxyType
-from unicodedata import normalize
 from typing import (Any, Optional, TypeVar, Callable, KeysView, Union,  # noqa
                     Iterable, List, Dict, Iterator, Coroutine, MutableSet)
 
+import slugify as unicode_slug
+
 from .dt import as_local, utcnow
 
 # pylint: disable=invalid-name
@@ -24,10 +25,6 @@ ENUM_T = TypeVar('ENUM_T', bound=enum.Enum)
 
 RE_SANITIZE_FILENAME = re.compile(r'(~|\.\.|/|\\)')
 RE_SANITIZE_PATH = re.compile(r'(~|\.(\.)+)')
-RE_SLUGIFY = re.compile(r'[^a-z0-9_]+')
-TBL_SLUGIFY = {
-    ord('ß'): 'ss'
-}
 
 
 def sanitize_filename(filename: str) -> str:
@@ -42,13 +39,7 @@ def sanitize_path(path: str) -> str:
 
 def slugify(text: str) -> str:
     """Slugify a given text."""
-    text = normalize('NFKD', text)
-    text = text.lower()
-    text = text.replace(" ", "_")
-    text = text.translate(TBL_SLUGIFY)
-    text = RE_SLUGIFY.sub("", text)
-
-    return text
+    return unicode_slug.slugify(text, separator='_')  # type: ignore
 
 
 def repr_helper(inp: Any) -> str:
diff --git a/homeassistant/util/async_.py b/homeassistant/util/async_.py
index 0185128abac..a4ad0e98a2e 100644
--- a/homeassistant/util/async_.py
+++ b/homeassistant/util/async_.py
@@ -28,7 +28,7 @@ except AttributeError:
         try:
             return loop.run_until_complete(main)
         finally:
-            asyncio.set_event_loop(None)  # type: ignore # not a bug
+            asyncio.set_event_loop(None)
             loop.close()
 
 
diff --git a/requirements_all.txt b/requirements_all.txt
index b09c97ede3f..15725711619 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1,19 +1,19 @@
 # Home Assistant core
-aiohttp==3.4.4
+aiohttp==3.5.1
 astral==1.7.1
 async_timeout==3.0.1
 attrs==18.2.0
 bcrypt==3.1.4
 certifi>=2018.04.16
-idna==2.7
 jinja2>=2.10
 PyJWT==1.6.4
 cryptography==2.3.1
 pip>=8.0.3
-pytz>=2018.04
+python-slugify==1.2.6
+pytz>=2018.07
 pyyaml>=3.13,<4
-requests==2.20.1
-ruamel.yaml==0.15.80
+requests==2.21.0
+ruamel.yaml==0.15.81
 voluptuous==0.11.5
 voluptuous-serialize==2.0.0
 
@@ -33,7 +33,7 @@ Adafruit-SHT31==1.0.2
 # Adafruit_BBIO==1.0.0
 
 # homeassistant.components.homekit
-HAP-python==2.4.1
+HAP-python==2.4.2
 
 # homeassistant.components.notify.mastodon
 Mastodon.py==1.3.1
@@ -54,7 +54,7 @@ PyQRCode==1.2.1
 PyRMVtransport==0.1.3
 
 # homeassistant.components.switch.switchbot
-PySwitchbot==0.4
+PySwitchbot==0.5
 
 # homeassistant.components.sensor.transport_nsw
 PyTransportNSW==0.1.1
@@ -63,7 +63,7 @@ PyTransportNSW==0.1.1
 PyXiaomiGateway==0.11.1
 
 # homeassistant.components.rpi_gpio
-# RPi.GPIO==0.6.1
+# RPi.GPIO==0.6.5
 
 # homeassistant.components.remember_the_milk
 RtmAPI==0.7.0
@@ -72,7 +72,7 @@ RtmAPI==0.7.0
 TravisPy==0.3.5
 
 # homeassistant.components.notify.twitter
-TwitterAPI==2.5.4
+TwitterAPI==2.5.8
 
 # homeassistant.components.sensor.waze_travel_time
 WazeRouteCalculator==0.6
@@ -87,7 +87,7 @@ abodepy==0.14.0
 afsapi==0.0.4
 
 # homeassistant.components.asuswrt
-aioasuswrt==1.1.15
+aioasuswrt==1.1.17
 
 # homeassistant.components.device_tracker.automatic
 aioautomatic==0.6.5
@@ -95,11 +95,17 @@ aioautomatic==0.6.5
 # homeassistant.components.sensor.dnsip
 aiodns==1.1.1
 
-# homeassistant.components.device_tracker.freebox
-aiofreepybox==0.0.5
+# homeassistant.components.esphome
+aioesphomeapi==1.4.1
+
+# homeassistant.components.freebox
+aiofreepybox==0.0.6
 
 # homeassistant.components.camera.yi
-aioftp==0.10.1
+aioftp==0.12.0
+
+# homeassistant.components.remote.harmony
+aioharmony==0.1.2
 
 # homeassistant.components.emulated_hue
 # homeassistant.components.http
@@ -132,6 +138,9 @@ alarmdecoder==1.13.2
 # homeassistant.components.sensor.alpha_vantage
 alpha_vantage==2.1.0
 
+# homeassistant.components.sensor.ambient_station
+ambient_api==1.5.2
+
 # homeassistant.components.amcrest
 amcrest==1.2.3
 
@@ -155,7 +164,7 @@ asterisk_mbox==0.5.0
 
 # homeassistant.components.upnp
 # homeassistant.components.media_player.dlna_dmr
-async-upnp-client==0.13.2
+async-upnp-client==0.13.8
 
 # homeassistant.components.light.avion
 # avion==0.10
@@ -202,7 +211,7 @@ blockchain==1.4.4
 # bluepy==1.1.4
 
 # homeassistant.components.sensor.bme680
-# bme680==1.0.4
+# bme680==1.0.5
 
 # homeassistant.components.route53
 # homeassistant.components.notify.aws_lambda
@@ -221,6 +230,9 @@ braviarc-homeassistant==0.3.7.dev0
 # homeassistant.components.switch.broadlink
 broadlink==0.9.0
 
+# homeassistant.components.sensor.brottsplatskartan
+brottsplatskartan==0.0.1
+
 # homeassistant.components.cover.brunt
 brunt==0.1.3
 
@@ -250,7 +262,7 @@ coinbase==2.1.0
 coinmarketcap==5.0.3
 
 # homeassistant.scripts.check_config
-colorlog==3.1.4
+colorlog==4.0.2
 
 # homeassistant.components.alarm_control_panel.concord232
 # homeassistant.components.binary_sensor.concord232
@@ -286,7 +298,10 @@ datapoint==0.4.3
 # homeassistant.components.light.decora_wifi
 # decora_wifi==1.3
 
+# homeassistant.components.ihc
+# homeassistant.components.namecheapdns
 # homeassistant.components.device_tracker.upc_connect
+# homeassistant.components.sensor.ohmconnect
 defusedxml==0.5.0
 
 # homeassistant.components.sensor.deluge
@@ -325,13 +340,13 @@ dsmr_parser==0.12
 dweepy==0.3.0
 
 # homeassistant.components.edp_redy
-edp_redy==0.0.2
+edp_redy==0.0.3
 
 # homeassistant.components.media_player.horizon
 einder==0.3.1
 
 # homeassistant.components.sensor.eliqonline
-eliqonline==1.0.14
+eliqonline==1.2.2
 
 # homeassistant.components.elkm1
 elkm1-lib==0.7.13
@@ -340,7 +355,7 @@ elkm1-lib==0.7.13
 enocean==0.40
 
 # homeassistant.components.sensor.entur_public_transport
-enturclient==0.1.0
+enturclient==0.1.3
 
 # homeassistant.components.sensor.envirophat
 # envirophat==0.0.6
@@ -416,7 +431,7 @@ gTTS-token==1.1.3
 gearbest_parser==1.0.7
 
 # homeassistant.components.sensor.geizhals
-geizhals==0.0.7
+geizhals==0.0.9
 
 # homeassistant.components.geo_location.geo_json_events
 # homeassistant.components.geo_location.nsw_rural_fire_service_feed
@@ -424,7 +439,7 @@ geizhals==0.0.7
 geojson_client==0.3
 
 # homeassistant.components.sensor.geo_rss_events
-georss_client==0.4
+georss_client==0.5
 
 # homeassistant.components.device_tracker.googlehome
 ghlocalapi==0.3.5
@@ -483,6 +498,9 @@ hikvision==0.4
 # homeassistant.components.notify.hipchat
 hipnotify==1.0.8
 
+# homeassistant.components.media_player.harman_kardon_avr
+hkavr==0.0.5
+
 # homeassistant.components.hlk_sw16
 hlk-sw16==0.0.6
 
@@ -493,13 +511,13 @@ hole==0.3.0
 holidays==0.9.8
 
 # homeassistant.components.frontend
-home-assistant-frontend==20181211.2
+home-assistant-frontend==20190109.0
 
 # homeassistant.components.zwave
-homeassistant-pyozw==0.1.1
+homeassistant-pyozw==0.1.2
 
 # homeassistant.components.homekit_controller
-# homekit==0.10
+# homekit==0.12.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8
@@ -508,11 +526,8 @@ homematicip==0.9.8
 # homeassistant.components.remember_the_milk
 httplib2==0.10.3
 
-# homeassistant.components.remote.harmony
-https://github.com/home-assistant/pyharmony/archive/31efd339a3c39e7b8f58e823a0eddb59013e03ae.zip#pyharmony==1.0.21b1
-
 # homeassistant.components.huawei_lte
-huawei-lte-api==1.0.16
+huawei-lte-api==1.1.1
 
 # homeassistant.components.hydrawise
 hydrawiser==0.1.1
@@ -536,7 +551,7 @@ ihcsdk==2.2.0
 influxdb==5.2.0
 
 # homeassistant.components.insteon
-insteonplm==0.15.1
+insteonplm==0.15.2
 
 # homeassistant.components.sensor.iperf3
 iperf3==0.1.10
@@ -555,10 +570,10 @@ jsonrpc-async==0.6
 jsonrpc-websocket==0.6
 
 # homeassistant.scripts.keyring
-keyring==17.0.0
+keyring==17.1.0
 
 # homeassistant.scripts.keyring
-keyrings.alt==3.1
+keyrings.alt==3.1.1
 
 # homeassistant.components.lock.kiwi
 kiwiki-client==0.1.1
@@ -567,7 +582,7 @@ kiwiki-client==0.1.1
 konnected==0.1.4
 
 # homeassistant.components.eufy
-lakeside==0.10
+lakeside==0.11
 
 # homeassistant.components.owntracks
 libnacl==1.6.1
@@ -612,6 +627,9 @@ locationsharinglib==3.0.9
 # homeassistant.components.logi_circle
 logi_circle==0.1.7
 
+# homeassistant.components.sensor.london_underground
+london-tube-status==0.2
+
 # homeassistant.components.luftdaten
 luftdaten==0.3.4
 
@@ -633,6 +651,9 @@ matrix-client==0.2.0
 # homeassistant.components.maxcube
 maxcube-api==0.1.0
 
+# homeassistant.components.mythicbeastsdns
+mbddns==0.1.2
+
 # homeassistant.components.notify.message_bird
 messagebird==1.2.0
 
@@ -647,7 +668,7 @@ mficlient==0.3.0
 miflora==0.4.0
 
 # homeassistant.components.climate.mill
-millheater==0.2.9
+millheater==0.3.3
 
 # homeassistant.components.sensor.mitemp_bt
 mitemp_bt==0.0.1
@@ -659,7 +680,7 @@ motorparts==1.0.2
 mutagen==1.41.1
 
 # homeassistant.components.mychevy
-mychevy==1.0.1
+mychevy==1.2.0
 
 # homeassistant.components.mycroft
 mycroftapi==2.0
@@ -675,13 +696,16 @@ nad_receiver==0.0.9
 nanoleaf==0.4.1
 
 # homeassistant.components.device_tracker.keenetic_ndms2
-ndms2_client==0.0.5
+ndms2_client==0.0.6
+
+# homeassistant.components.ness_alarm
+nessclient==0.9.9
 
 # homeassistant.components.sensor.netdata
 netdata==0.1.2
 
 # homeassistant.components.discovery
-netdisco==2.2.0
+netdisco==2.3.0
 
 # homeassistant.components.sensor.neurio_energy
 neurio==0.3.1
@@ -722,6 +746,9 @@ openevsewifi==0.4
 # homeassistant.components.media_player.openhome
 openhomedevice==0.4.2
 
+# homeassistant.components.air_quality.opensensemap
+opensensemap-api==0.1.3
+
 # homeassistant.components.switch.orvibo
 orvibo==1.1.1
 
@@ -738,6 +765,9 @@ panasonic_viera==0.3.1
 # homeassistant.components.media_player.dunehd
 pdunehd==1.3
 
+# homeassistant.components.switch.pencom
+pencompy==0.0.3
+
 # homeassistant.components.device_tracker.aruba
 # homeassistant.components.device_tracker.cisco_ios
 # homeassistant.components.device_tracker.unifi_direct
@@ -767,6 +797,9 @@ pizzapi==0.0.3
 # homeassistant.components.sensor.plex
 plexapi==3.0.6
 
+# homeassistant.components.plum_lightpad
+plumlightpad==0.0.11
+
 # homeassistant.components.sensor.mhz19
 # homeassistant.components.sensor.serial_pm
 pmsensor==0.4
@@ -777,6 +810,12 @@ pocketcasts==0.1
 # homeassistant.components.sensor.postnl
 postnl_api==1.0.2
 
+# homeassistant.components.sensor.islamic_prayer_times
+prayer_times_calculator==0.0.3
+
+# homeassistant.components.sensor.prezzibenzina
+prezzibenzina-py==1.1.4
+
 # homeassistant.components.climate.proliphix
 proliphix==0.4.1
 
@@ -837,7 +876,7 @@ pyRFXtrx==0.23
 pySwitchmate==0.4.4
 
 # homeassistant.components.tibber
-pyTibber==0.8.6
+pyTibber==0.9.0
 
 # homeassistant.components.switch.dlink
 pyW215==0.6.0
@@ -851,6 +890,9 @@ pyW800rf32==0.1
 # homeassistant.components.ads
 pyads==2.2.6
 
+# homeassistant.components.sensor.aftership
+pyaftership==0.1.2
+
 # homeassistant.components.sensor.airvisual
 pyairvisual==2.0.1
 
@@ -858,7 +900,7 @@ pyairvisual==2.0.1
 pyalarmdotcom==0.3.2
 
 # homeassistant.components.arlo
-pyarlo==0.2.2
+pyarlo==0.2.3
 
 # homeassistant.components.netatmo
 pyatmo==1.4
@@ -877,7 +919,7 @@ pyblackbird==0.5
 # pybluez==0.22
 
 # homeassistant.components.neato
-pybotvac==0.0.10
+pybotvac==0.0.12
 
 # homeassistant.components.cloudflare
 pycfdns==0.0.1
@@ -901,8 +943,7 @@ pycsspeechtts==1.0.2
 # pycups==1.9.73
 
 # homeassistant.components.daikin
-# homeassistant.components.climate.daikin
-pydaikin==0.8
+pydaikin==0.9
 
 # homeassistant.components.deconz
 pydeconz==47
@@ -926,13 +967,13 @@ pyeconet==0.0.6
 pyedimax==0.1
 
 # homeassistant.components.eight_sleep
-pyeight==0.0.9
+pyeight==0.1.0
 
 # homeassistant.components.media_player.emby
-pyemby==1.5
+pyemby==1.6
 
 # homeassistant.components.envisalink
-pyenvisalink==3.7
+pyenvisalink==3.8
 
 # homeassistant.components.climate.ephember
 pyephember==0.2.0
@@ -947,7 +988,7 @@ pyflexit==0.3
 pyflic-homeassistant==0.4.dev0
 
 # homeassistant.components.sensor.flunearyou
-pyflunearyou==0.0.2
+pyflunearyou==1.0.0
 
 # homeassistant.components.light.futurenow
 pyfnip==0.2
@@ -966,19 +1007,25 @@ pygatt==3.2.0
 pygogogate2==0.1.1
 
 # homeassistant.components.sensor.gtfs
-pygtfs-homeassistant==0.1.3.dev0
+pygtfs==0.1.5
+
+# homeassistant.components.sensor.gtt
+pygtt==1.1.2
 
 # homeassistant.components.sensor.version
 pyhaversion==2.0.3
 
 # homeassistant.components.binary_sensor.hikvision
-pyhik==0.1.8
+pyhik==0.1.9
 
 # homeassistant.components.hive
 pyhiveapi==0.2.14
 
 # homeassistant.components.homematic
-pyhomematic==0.1.53
+pyhomematic==0.1.54
+
+# homeassistant.components.homeworks
+pyhomeworks==0.0.6
 
 # homeassistant.components.sensor.hydroquebec
 pyhydroquebec==2.2.2
@@ -1014,7 +1061,7 @@ pylacrosse==0.3.1
 pylast==2.4.0
 
 # homeassistant.components.sensor.launch_library
-pylaunches==0.1.2
+pylaunches==0.2.0
 
 # homeassistant.components.media_player.lg_netcast
 pylgnetcast-homeassistant==0.2.0.dev0
@@ -1036,7 +1083,7 @@ pyloopenergy==0.0.18
 pylutron-caseta==0.5.0
 
 # homeassistant.components.lutron
-pylutron==0.1.0
+pylutron==0.2.0
 
 # homeassistant.components.notify.mailgun
 pymailgunner==1.4
@@ -1045,7 +1092,7 @@ pymailgunner==1.4
 pymediaroom==0.6.4
 
 # homeassistant.components.media_player.xiaomi_tv
-pymitv==1.4.0
+pymitv==1.4.3
 
 # homeassistant.components.mochad
 pymochad==0.2.0
@@ -1069,7 +1116,7 @@ pymysensors==0.18.0
 pynello==2.0.2
 
 # homeassistant.components.device_tracker.netgear
-pynetgear==0.5.1
+pynetgear==0.5.2
 
 # homeassistant.components.switch.netio
 pynetio==0.1.9.1
@@ -1094,7 +1141,7 @@ pyoppleio==1.0.5
 pyota==2.0.5
 
 # homeassistant.components.opentherm_gw
-pyotgw==0.3b1
+pyotgw==0.4b1
 
 # homeassistant.auth.mfa_modules.notify
 # homeassistant.auth.mfa_modules.totp
@@ -1103,7 +1150,10 @@ pyotp==2.2.6
 
 # homeassistant.components.sensor.openweathermap
 # homeassistant.components.weather.openweathermap
-pyowm==2.9.0
+pyowm==2.10.0
+
+# homeassistant.components.lcn
+pypck==0.5.9
 
 # homeassistant.components.media_player.pjlink
 pypjlink2==1.2.0
@@ -1117,6 +1167,9 @@ pypollencom==2.2.2
 # homeassistant.components.qwikswitch
 pyqwikswitch==0.8
 
+# homeassistant.components.sensor.nmbs
+pyrail==0.0.3
+
 # homeassistant.components.rainbird
 pyrainbird==0.1.6
 
@@ -1165,7 +1218,7 @@ pystride==0.1.7
 pysyncthru==0.3.1
 
 # homeassistant.components.sensor.tautulli
-pytautulli==0.4.1
+pytautulli==0.5.0
 
 # homeassistant.components.media_player.liveboxplaytv
 pyteleloisirs==3.4
@@ -1256,7 +1309,7 @@ python-roku==3.1.5
 python-sochain-api==0.0.2
 
 # homeassistant.components.media_player.songpal
-python-songpal==0.0.8
+python-songpal==0.0.9.1
 
 # homeassistant.components.sensor.synologydsm
 python-synology==0.2.0
@@ -1298,7 +1351,7 @@ pytile==2.0.5
 pytouchline==0.7
 
 # homeassistant.components.device_tracker.traccar
-pytraccar==0.1.2
+pytraccar==0.2.1
 
 # homeassistant.components.device_tracker.trackr
 pytrackr==0.0.5
@@ -1334,7 +1387,7 @@ pyvlx==0.1.3
 pywebpush==1.6.0
 
 # homeassistant.components.wemo
-pywemo==0.4.33
+pywemo==0.4.34
 
 # homeassistant.components.camera.xeoma
 pyxeoma==1.4.0
@@ -1352,7 +1405,7 @@ quantum-gateway==0.0.3
 rachiopy==0.1.3
 
 # homeassistant.components.climate.radiotherm
-radiotherm==1.4.1
+radiotherm==2.0.0
 
 # homeassistant.components.raincloud
 raincloudy==0.0.5
@@ -1360,12 +1413,18 @@ raincloudy==0.0.5
 # homeassistant.components.raspihats
 # raspihats==2.2.3
 
+# homeassistant.components.switch.raspyrfm
+raspyrfm-client==1.2.8
+
 # homeassistant.components.rainmachine
-regenmaschine==1.0.7
+regenmaschine==1.1.0
 
 # homeassistant.components.python_script
 restrictedpython==4.0b7
 
+# homeassistant.components.idteck_prox
+rfk101py==0.0.1
+
 # homeassistant.components.rflink
 rflink==0.0.37
 
@@ -1382,7 +1441,7 @@ rocketchat-API==0.6.1
 roombapy==1.3.1
 
 # homeassistant.components.switch.rpi_rf
-# rpi-rf==0.9.6
+# rpi-rf==0.9.7
 
 # homeassistant.components.media_player.russound_rnet
 russound==0.1.9
@@ -1397,7 +1456,7 @@ rxv==0.5.1
 samsungctl[websocket]==0.7.1
 
 # homeassistant.components.satel_integra
-satel_integra==0.1.0
+satel_integra==0.2.0
 
 # homeassistant.components.sensor.deutsche_bahn
 schiene==0.22
@@ -1431,10 +1490,10 @@ simplisafe-python==3.1.14
 sisyphus-control==2.1
 
 # homeassistant.components.skybell
-skybellpy==0.2.0
+skybellpy==0.3.0
 
 # homeassistant.components.notify.slack
-slacker==0.11.0
+slacker==0.12.0
 
 # homeassistant.components.sleepiq
 sleepyq==0.6
@@ -1462,6 +1521,9 @@ snapcast==2.0.9
 # homeassistant.components.sensor.socialblade
 socialbladeclient==0.2
 
+# homeassistant.components.sensor.solaredge
+solaredge==0.0.2
+
 # homeassistant.components.climate.honeywell
 somecomfort==0.5.2
 
@@ -1479,7 +1541,7 @@ spotipy-homeassistant==2.4.4.dev1
 
 # homeassistant.components.recorder
 # homeassistant.components.sensor.sql
-sqlalchemy==1.2.14
+sqlalchemy==1.2.15
 
 # homeassistant.components.sensor.srp_energy
 srpenergy==1.0.5
@@ -1524,7 +1586,7 @@ tellcore-net==0.4
 tellcore-py==1.1.2
 
 # homeassistant.components.tellduslive
-tellduslive==0.10.4
+tellduslive==0.10.8
 
 # homeassistant.components.media_player.lg_soundbar
 temescal==0.1
@@ -1573,7 +1635,7 @@ twilio==6.19.1
 uber_rides==0.6.0
 
 # homeassistant.components.upcloud
-upcloud-api==0.4.2
+upcloud-api==0.4.3
 
 # homeassistant.components.sensor.ups
 upsmychoice==1.0.6
@@ -1591,7 +1653,7 @@ venstarcolortouch==0.6
 volkszaehler==0.1.2
 
 # homeassistant.components.volvooncall
-volvooncall==0.7.11
+volvooncall==0.8.7
 
 # homeassistant.components.verisure
 vsure==1.5.2
@@ -1621,7 +1683,7 @@ watchdog==0.8.3
 waterfurnace==1.0.0
 
 # homeassistant.components.media_player.gpmdp
-websocket-client==0.37.0
+websocket-client==0.54.0
 
 # homeassistant.components.media_player.webostv
 websockets==6.0
@@ -1639,7 +1701,7 @@ xbee-helper==0.0.7
 xboxapi==0.1.1
 
 # homeassistant.components.knx
-xknx==0.9.1
+xknx==0.9.3
 
 # homeassistant.components.media_player.bluesound
 # homeassistant.components.sensor.startca
@@ -1653,7 +1715,7 @@ xmltodict==0.11.0
 yahooweather==0.10
 
 # homeassistant.components.alarm_control_panel.yale_smart_alarm
-yalesmartalarmclient==0.1.5
+yalesmartalarmclient==0.1.6
 
 # homeassistant.components.light.yeelight
 yeelight==0.4.3
@@ -1662,7 +1724,7 @@ yeelight==0.4.3
 yeelightsunflower==0.0.10
 
 # homeassistant.components.media_extractor
-youtube_dl==2018.11.23
+youtube_dl==2018.12.17
 
 # homeassistant.components.light.zengge
 zengge==0.2
@@ -1670,6 +1732,9 @@ zengge==0.2
 # homeassistant.components.zeroconf
 zeroconf==0.21.3
 
+# homeassistant.components.zha
+zha-quirks==0.0.5
+
 # homeassistant.components.climate.zhong_hong
 zhong_hong_hvac==1.0.9
 
@@ -1683,4 +1748,4 @@ zigpy-xbee==0.1.1
 zigpy==0.2.0
 
 # homeassistant.components.zoneminder
-zm-py==0.1.0
+zm-py==0.3.0
diff --git a/requirements_docs.txt b/requirements_docs.txt
index 7fd779d4231..73a104b1ffe 100644
--- a/requirements_docs.txt
+++ b/requirements_docs.txt
@@ -1,3 +1,3 @@
-Sphinx==1.8.2
-sphinx-autodoc-typehints==1.5.1
-sphinx-autodoc-annotation==1.0.post1
+Sphinx==1.8.3
+sphinx-autodoc-typehints==1.6.0
+sphinx-autodoc-annotation==1.0.post1
\ No newline at end of file
diff --git a/requirements_test.txt b/requirements_test.txt
index 8d761c1e614..ffc56cdb582 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -6,12 +6,12 @@ coveralls==1.2.0
 flake8-docstrings==1.3.0
 flake8==3.6.0
 mock-open==1.3.1
-mypy==0.641
-pydocstyle==2.1.1
-pylint==2.1.1
+mypy==0.650
+pydocstyle==3.0.0
+pylint==2.2.2
 pytest-aiohttp==0.3.0
 pytest-cov==2.6.0
 pytest-sugar==0.9.2
 pytest-timeout==1.3.3
-pytest==4.0.1
+pytest==4.0.2
 requests_mock==1.5.2
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 045d6fe3f26..ebee97e43c2 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -7,19 +7,19 @@ coveralls==1.2.0
 flake8-docstrings==1.3.0
 flake8==3.6.0
 mock-open==1.3.1
-mypy==0.641
-pydocstyle==2.1.1
-pylint==2.1.1
+mypy==0.650
+pydocstyle==3.0.0
+pylint==2.2.2
 pytest-aiohttp==0.3.0
 pytest-cov==2.6.0
 pytest-sugar==0.9.2
 pytest-timeout==1.3.3
-pytest==4.0.1
+pytest==4.0.2
 requests_mock==1.5.2
 
 
 # homeassistant.components.homekit
-HAP-python==2.4.1
+HAP-python==2.4.2
 
 # homeassistant.components.sensor.rmvtransport
 PyRMVtransport==0.1.3
@@ -52,14 +52,17 @@ caldav==0.5.0
 # homeassistant.components.sensor.coinmarketcap
 coinmarketcap==5.0.3
 
+# homeassistant.components.ihc
+# homeassistant.components.namecheapdns
 # homeassistant.components.device_tracker.upc_connect
+# homeassistant.components.sensor.ohmconnect
 defusedxml==0.5.0
 
 # homeassistant.components.sensor.dsmr
 dsmr_parser==0.12
 
 # homeassistant.components.sensor.entur_public_transport
-enturclient==0.1.0
+enturclient==0.1.3
 
 # homeassistant.components.sensor.season
 ephem==3.7.6.0
@@ -83,7 +86,7 @@ gTTS-token==1.1.3
 geojson_client==0.3
 
 # homeassistant.components.sensor.geo_rss_events
-georss_client==0.4
+georss_client==0.5
 
 # homeassistant.components.ffmpeg
 ha-ffmpeg==1.9
@@ -101,7 +104,7 @@ hdate==0.7.5
 holidays==0.9.8
 
 # homeassistant.components.frontend
-home-assistant-frontend==20181211.2
+home-assistant-frontend==20190109.0
 
 # homeassistant.components.homematicip_cloud
 homematicip==0.9.8
@@ -122,6 +125,9 @@ libsoundtouch==0.7.2
 # homeassistant.components.luftdaten
 luftdaten==0.3.4
 
+# homeassistant.components.mythicbeastsdns
+mbddns==0.1.2
+
 # homeassistant.components.sensor.mfi
 # homeassistant.components.switch.mfi
 mficlient==0.3.0
@@ -169,7 +175,7 @@ pydeconz==47
 pydispatcher==2.0.5
 
 # homeassistant.components.homematic
-pyhomematic==0.1.53
+pyhomematic==0.1.54
 
 # homeassistant.components.litejet
 pylitejet==0.1
@@ -221,7 +227,7 @@ pyunifi==2.13
 pywebpush==1.6.0
 
 # homeassistant.components.rainmachine
-regenmaschine==1.0.7
+regenmaschine==1.1.0
 
 # homeassistant.components.python_script
 restrictedpython==4.0b7
@@ -249,7 +255,7 @@ somecomfort==0.5.2
 
 # homeassistant.components.recorder
 # homeassistant.components.sensor.sql
-sqlalchemy==1.2.14
+sqlalchemy==1.2.15
 
 # homeassistant.components.sensor.srp_energy
 srpenergy==1.0.5
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index cc81341e91b..5cd1d4b22d1 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -68,6 +68,7 @@ TEST_REQUIREMENTS = (
     'libpurecoollink',
     'libsoundtouch',
     'luftdaten',
+    'mbddns',
     'mficlient',
     'numpy',
     'paho-mqtt',
diff --git a/setup.py b/setup.py
index f4da5411ed5..0581d7bfcfa 100755
--- a/setup.py
+++ b/setup.py
@@ -32,23 +32,22 @@ PROJECT_URLS = {
 PACKAGES = find_packages(exclude=['tests', 'tests.*'])
 
 REQUIRES = [
-    'aiohttp==3.4.4',
+    'aiohttp==3.5.1',
     'astral==1.7.1',
     'async_timeout==3.0.1',
     'attrs==18.2.0',
     'bcrypt==3.1.4',
     'certifi>=2018.04.16',
-    # Dec 5, 2018: Idna released 2.8, requests caps idna at <2.8, CI fails
-    'idna==2.7',
     'jinja2>=2.10',
     'PyJWT==1.6.4',
     # PyJWT has loose dependency. We want the latest one.
     'cryptography==2.3.1',
     'pip>=8.0.3',
-    'pytz>=2018.04',
+    'python-slugify==1.2.6',
+    'pytz>=2018.07',
     'pyyaml>=3.13,<4',
-    'requests==2.20.1',
-    'ruamel.yaml==0.15.80',
+    'requests==2.21.0',
+    'ruamel.yaml==0.15.81',
     'voluptuous==0.11.5',
     'voluptuous-serialize==2.0.0',
 ]
diff --git a/tests/components/air_quality/__init__.py b/tests/components/air_quality/__init__.py
new file mode 100644
index 00000000000..c53122cb1b9
--- /dev/null
+++ b/tests/components/air_quality/__init__.py
@@ -0,0 +1 @@
+"""The tests for Air Quality platforms."""
diff --git a/tests/components/air_quality/test_air_quality.py b/tests/components/air_quality/test_air_quality.py
new file mode 100644
index 00000000000..7ad1300b945
--- /dev/null
+++ b/tests/components/air_quality/test_air_quality.py
@@ -0,0 +1,42 @@
+"""The tests for the Air Quality component."""
+from homeassistant.components.air_quality import (
+    ATTR_ATTRIBUTION, ATTR_N2O,
+    ATTR_OZONE, ATTR_PM_10)
+from homeassistant.setup import async_setup_component
+
+
+async def test_state(hass):
+    """Test Air Quality state."""
+    config = {
+        'air_quality': {
+            'platform': 'demo',
+        }
+    }
+
+    assert await async_setup_component(hass, 'air_quality', config)
+
+    state = hass.states.get('air_quality.demo_air_quality_home')
+    assert state is not None
+
+    assert state.state == '14'
+
+
+async def test_attributes(hass):
+    """Test Air Quality attributes."""
+    config = {
+        'air_quality': {
+            'platform': 'demo',
+        }
+    }
+
+    assert await async_setup_component(hass, 'air_quality', config)
+
+    state = hass.states.get('air_quality.demo_air_quality_office')
+    assert state is not None
+
+    data = state.attributes
+    assert data.get(ATTR_PM_10) == 16
+    assert data.get(ATTR_N2O) is None
+    assert data.get(ATTR_OZONE) is None
+    assert data.get(ATTR_ATTRIBUTION) == \
+        'Powered by Home Assistant'
diff --git a/tests/components/alarm_control_panel/test_mqtt.py b/tests/components/alarm_control_panel/test_mqtt.py
index 24f1b00ee90..9f161aaf083 100644
--- a/tests/components/alarm_control_panel/test_mqtt.py
+++ b/tests/components/alarm_control_panel/test_mqtt.py
@@ -1,5 +1,7 @@
 """The tests the MQTT alarm control panel component."""
+import json
 import unittest
+from unittest.mock import ANY
 
 from homeassistant.setup import setup_component
 from homeassistant.const import (
@@ -10,8 +12,9 @@ from homeassistant.components import alarm_control_panel, mqtt
 from homeassistant.components.mqtt.discovery import async_start
 
 from tests.common import (
-    mock_mqtt_component, async_fire_mqtt_message, fire_mqtt_message,
-    get_test_home_assistant, assert_setup_component, MockConfigEntry)
+    assert_setup_component, async_fire_mqtt_message, async_mock_mqtt_component,
+    async_setup_component, fire_mqtt_message, get_test_home_assistant,
+    mock_mqtt_component, MockConfigEntry, mock_registry)
 from tests.components.alarm_control_panel import common
 
 CODE = 'HELLO_CODE'
@@ -243,6 +246,29 @@ class TestAlarmControlPanelMQTT(unittest.TestCase):
         fire_mqtt_message(self.hass, 'availability-topic', 'good')
 
 
+async def test_unique_id(hass):
+    """Test unique id option only creates one alarm per unique_id."""
+    await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, alarm_control_panel.DOMAIN, {
+        alarm_control_panel.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'Test 1',
+            'state_topic': 'test-topic',
+            'command_topic': 'test_topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }, {
+            'platform': 'mqtt',
+            'name': 'Test 2',
+            'state_topic': 'test-topic',
+            'command_topic': 'test_topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+    async_fire_mqtt_message(hass, 'test-topic', 'payload')
+    await hass.async_block_till_done()
+    assert len(hass.states.async_entity_ids(alarm_control_panel.DOMAIN)) == 1
+
+
 async def test_discovery_removal_alarm(hass, mqtt_mock, caplog):
     """Test removal of discovered alarm_control_panel."""
     entry = MockConfigEntry(domain=mqtt.DOMAIN)
@@ -310,3 +336,79 @@ async def test_discovery_update_alarm(hass, mqtt_mock, caplog):
 
     state = hass.states.get('alarm_control_panel.milk')
     assert state is None
+
+
+async def test_entity_device_info_with_identifier(hass, mqtt_mock):
+    """Test MQTT alarm control panel device registry integration."""
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+    entry.add_to_hass(hass)
+    await async_start(hass, 'homeassistant', {}, entry)
+    registry = await hass.helpers.device_registry.async_get_registry()
+
+    data = json.dumps({
+        'platform': 'mqtt',
+        'name': 'Test 1',
+        'state_topic': 'test-topic',
+        'command_topic': 'test-topic',
+        'device': {
+            'identifiers': ['helloworld'],
+            'connections': [
+                ["mac", "02:5b:26:a8:dc:12"],
+            ],
+            'manufacturer': 'Whatever',
+            'name': 'Beer',
+            'model': 'Glass',
+            'sw_version': '0.1-beta',
+        },
+        'unique_id': 'veryunique'
+    })
+    async_fire_mqtt_message(
+        hass, 'homeassistant/alarm_control_panel/bla/config', data)
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    device = registry.async_get_device({('mqtt', 'helloworld')}, set())
+    assert device is not None
+    assert device.identifiers == {('mqtt', 'helloworld')}
+    assert device.connections == {('mac', "02:5b:26:a8:dc:12")}
+    assert device.manufacturer == 'Whatever'
+    assert device.name == 'Beer'
+    assert device.model == 'Glass'
+    assert device.sw_version == '0.1-beta'
+
+
+async def test_entity_id_update(hass, mqtt_mock):
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    registry = mock_registry(hass, {})
+    mock_mqtt = await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, alarm_control_panel.DOMAIN, {
+        alarm_control_panel.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'beer',
+            'state_topic': 'test-topic',
+            'command_topic': 'command-topic',
+            'availability_topic': 'avty-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+
+    state = hass.states.get('alarm_control_panel.beer')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.reset_mock()
+
+    registry.async_update_entity(
+        'alarm_control_panel.beer', new_entity_id='alarm_control_panel.milk')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    state = hass.states.get('alarm_control_panel.beer')
+    assert state is None
+
+    state = hass.states.get('alarm_control_panel.milk')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
diff --git a/tests/components/alexa/test_smart_home.py b/tests/components/alexa/test_smart_home.py
index ddf66d1c617..93551076461 100644
--- a/tests/components/alexa/test_smart_home.py
+++ b/tests/components/alexa/test_smart_home.py
@@ -11,11 +11,24 @@ from homeassistant.const import (
 from homeassistant.setup import async_setup_component
 from homeassistant.components import alexa
 from homeassistant.components.alexa import smart_home
+from homeassistant.components.alexa.auth import Auth
 from homeassistant.helpers import entityfilter
 
 from tests.common import async_mock_service
 
-DEFAULT_CONFIG = smart_home.Config(should_expose=lambda entity_id: True)
+
+async def get_access_token():
+    """Return a test access token."""
+    return "thisisnotanacesstoken"
+
+
+TEST_URL = "https://api.amazonalexa.com/v3/events"
+TEST_TOKEN_URL = "https://api.amazon.com/auth/o2/token"
+
+DEFAULT_CONFIG = smart_home.Config(
+    endpoint=TEST_URL,
+    async_get_access_token=get_access_token,
+    should_expose=lambda entity_id: True)
 
 
 @pytest.fixture
@@ -940,12 +953,15 @@ async def test_exclude_filters(hass):
     hass.states.async_set(
         'cover.deny', 'off', {'friendly_name': "Blocked cover"})
 
-    config = smart_home.Config(should_expose=entityfilter.generate_filter(
-        include_domains=[],
-        include_entities=[],
-        exclude_domains=['script'],
-        exclude_entities=['cover.deny'],
-    ))
+    config = smart_home.Config(
+        endpoint=None,
+        async_get_access_token=None,
+        should_expose=entityfilter.generate_filter(
+            include_domains=[],
+            include_entities=[],
+            exclude_domains=['script'],
+            exclude_entities=['cover.deny'],
+        ))
 
     msg = await smart_home.async_handle_message(hass, config, request)
     await hass.async_block_till_done()
@@ -972,12 +988,15 @@ async def test_include_filters(hass):
     hass.states.async_set(
         'group.allow', 'off', {'friendly_name': "Allowed group"})
 
-    config = smart_home.Config(should_expose=entityfilter.generate_filter(
-        include_domains=['automation', 'group'],
-        include_entities=['script.deny'],
-        exclude_domains=[],
-        exclude_entities=[],
-    ))
+    config = smart_home.Config(
+        endpoint=None,
+        async_get_access_token=None,
+        should_expose=entityfilter.generate_filter(
+            include_domains=['automation', 'group'],
+            include_entities=['script.deny'],
+            exclude_domains=[],
+            exclude_entities=[],
+        ))
 
     msg = await smart_home.async_handle_message(hass, config, request)
     await hass.async_block_till_done()
@@ -998,12 +1017,15 @@ async def test_never_exposed_entities(hass):
     hass.states.async_set(
         'group.allow', 'off', {'friendly_name': "Allowed group"})
 
-    config = smart_home.Config(should_expose=entityfilter.generate_filter(
-        include_domains=['group'],
-        include_entities=[],
-        exclude_domains=[],
-        exclude_entities=[],
-    ))
+    config = smart_home.Config(
+        endpoint=None,
+        async_get_access_token=None,
+        should_expose=entityfilter.generate_filter(
+            include_domains=['group'],
+            include_entities=[],
+            exclude_domains=[],
+            exclude_entities=[],
+        ))
 
     msg = await smart_home.async_handle_message(hass, config, request)
     await hass.async_block_till_done()
@@ -1293,6 +1315,33 @@ async def test_api_increase_color_temp(hass, result, initial):
     assert msg['header']['name'] == 'Response'
 
 
+async def test_api_accept_grant(hass):
+    """Test api AcceptGrant process."""
+    request = get_new_request("Alexa.Authorization", "AcceptGrant")
+
+    # add payload
+    request['directive']['payload'] = {
+      'grant': {
+        'type': 'OAuth2.AuthorizationCode',
+        'code': 'VGhpcyBpcyBhbiBhdXRob3JpemF0aW9uIGNvZGUuIDotKQ=='
+      },
+      'grantee': {
+        'type': 'BearerToken',
+        'token': 'access-token-from-skill'
+      }
+    }
+
+    # setup test devices
+    msg = await smart_home.async_handle_message(
+        hass, DEFAULT_CONFIG, request)
+    await hass.async_block_till_done()
+
+    assert 'event' in msg
+    msg = msg['event']
+
+    assert msg['header']['name'] == 'AcceptGrant.Response'
+
+
 async def test_report_lock_state(hass):
     """Test LockController implements lockState property."""
     hass.states.async_set(
@@ -1412,6 +1461,8 @@ async def test_entity_config(hass):
         'light.test_1', 'on', {'friendly_name': "Test light 1"})
 
     config = smart_home.Config(
+        endpoint=None,
+        async_get_access_token=None,
         should_expose=lambda entity_id: True,
         entity_config={
             'light.test_1': {
@@ -1598,3 +1649,104 @@ async def test_disabled(hass):
     assert msg['header']['name'] == 'ErrorResponse'
     assert msg['header']['namespace'] == 'Alexa'
     assert msg['payload']['type'] == 'BRIDGE_UNREACHABLE'
+
+
+async def test_report_state(hass, aioclient_mock):
+    """Test proactive state reports."""
+    aioclient_mock.post(TEST_URL, json={'data': 'is irrelevant'})
+
+    hass.states.async_set(
+        'binary_sensor.test_contact',
+        'on',
+        {
+            'friendly_name': "Test Contact Sensor",
+            'device_class': 'door',
+        }
+    )
+
+    await smart_home.async_enable_proactive_mode(hass, DEFAULT_CONFIG)
+
+    hass.states.async_set(
+        'binary_sensor.test_contact',
+        'off',
+        {
+            'friendly_name': "Test Contact Sensor",
+            'device_class': 'door',
+        }
+    )
+
+    # To trigger event listener
+    await hass.async_block_till_done()
+
+    assert len(aioclient_mock.mock_calls) == 1
+    call = aioclient_mock.mock_calls
+
+    call_json = json.loads(call[0][2])
+    assert call_json["event"]["payload"]["change"]["properties"][0][
+               "value"] == "NOT_DETECTED"
+    assert call_json["event"]["endpoint"][
+               "endpointId"] == "binary_sensor#test_contact"
+
+
+async def run_auth_get_access_token(hass, aioclient_mock, expires_in,
+                                    client_id, client_secret,
+                                    accept_grant_code, refresh_token):
+    """Do auth and request a new token for tests."""
+    aioclient_mock.post(TEST_TOKEN_URL,
+                        json={'access_token': 'the_access_token',
+                              'refresh_token': refresh_token,
+                              'expires_in': expires_in})
+
+    auth = Auth(hass, client_id, client_secret)
+    await auth.async_do_auth(accept_grant_code)
+    await auth.async_get_access_token()
+
+
+async def test_auth_get_access_token_expired(hass, aioclient_mock):
+    """Test the auth get access token function."""
+    client_id = "client123"
+    client_secret = "shhhhh"
+    accept_grant_code = "abcdefg"
+    refresh_token = "refresher"
+
+    await run_auth_get_access_token(hass, aioclient_mock, -5,
+                                    client_id, client_secret,
+                                    accept_grant_code, refresh_token)
+
+    assert len(aioclient_mock.mock_calls) == 2
+    calls = aioclient_mock.mock_calls
+
+    auth_call_json = calls[0][2]
+    token_call_json = calls[1][2]
+
+    assert auth_call_json["grant_type"] == "authorization_code"
+    assert auth_call_json["code"] == accept_grant_code
+    assert auth_call_json["client_id"] == client_id
+    assert auth_call_json["client_secret"] == client_secret
+
+    assert token_call_json["grant_type"] == "refresh_token"
+    assert token_call_json["refresh_token"] == refresh_token
+    assert token_call_json["client_id"] == client_id
+    assert token_call_json["client_secret"] == client_secret
+
+
+async def test_auth_get_access_token_not_expired(hass, aioclient_mock):
+    """Test the auth get access token function."""
+    client_id = "client123"
+    client_secret = "shhhhh"
+    accept_grant_code = "abcdefg"
+    refresh_token = "refresher"
+
+    await run_auth_get_access_token(hass, aioclient_mock, 555,
+                                    client_id, client_secret,
+                                    accept_grant_code, refresh_token)
+
+    assert len(aioclient_mock.mock_calls) == 1
+    call = aioclient_mock.mock_calls
+
+    auth_call_json = call[0][2]
+
+    assert auth_call_json["grant_type"] == "authorization_code"
+    assert auth_call_json["code"] == accept_grant_code
+    assert auth_call_json["client_id"] == client_id
+    assert auth_call_json["client_secret"] == client_secret
diff --git a/tests/components/automation/test_init.py b/tests/components/automation/test_init.py
index a01b48b9190..12c97507a13 100644
--- a/tests/components/automation/test_init.py
+++ b/tests/components/automation/test_init.py
@@ -864,3 +864,24 @@ def test_automation_not_trigger_on_bootstrap(hass):
 
     assert len(calls) == 1
     assert ['hello.world'] == calls[0].data.get(ATTR_ENTITY_ID)
+
+
+async def test_automation_with_error_in_script(hass, caplog):
+    """Test automation with an error in script."""
+    assert await async_setup_component(hass, automation.DOMAIN, {
+        automation.DOMAIN: {
+            'alias': 'hello',
+            'trigger': {
+                'platform': 'event',
+                'event_type': 'test_event',
+            },
+            'action': {
+                'service': 'test.automation',
+                'entity_id': 'hello.world'
+            }
+        }
+    })
+
+    hass.bus.async_fire('test_event')
+    await hass.async_block_till_done()
+    assert 'Service test.automation not found' in caplog.text
diff --git a/tests/components/binary_sensor/test_mqtt.py b/tests/components/binary_sensor/test_mqtt.py
index 71d179211a2..71a30e6ee18 100644
--- a/tests/components/binary_sensor/test_mqtt.py
+++ b/tests/components/binary_sensor/test_mqtt.py
@@ -1,7 +1,7 @@
 """The tests for the  MQTT binary sensor platform."""
 import json
 import unittest
-from unittest.mock import Mock
+from unittest.mock import ANY, Mock, patch
 from datetime import timedelta
 
 import homeassistant.core as ha
@@ -16,7 +16,7 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import (
     get_test_home_assistant, fire_mqtt_message, async_fire_mqtt_message,
-    fire_time_changed, mock_component, mock_mqtt_component,
+    fire_time_changed, mock_component, mock_mqtt_component, mock_registry,
     async_mock_mqtt_component, MockConfigEntry)
 
 
@@ -58,6 +58,33 @@ class TestSensorMQTT(unittest.TestCase):
         state = self.hass.states.get('binary_sensor.test')
         assert STATE_OFF == state.state
 
+    def test_setting_sensor_value_via_mqtt_message_and_template(self):
+        """Test the setting of the value via MQTT."""
+        assert setup_component(self.hass, binary_sensor.DOMAIN, {
+            binary_sensor.DOMAIN: {
+                'platform': 'mqtt',
+                'name': 'test',
+                'state_topic': 'test-topic',
+                'payload_on': 'ON',
+                'payload_off': 'OFF',
+                'value_template': '{%if is_state(entity_id,\"on\")-%}OFF'
+                                  '{%-else-%}ON{%-endif%}'
+            }
+        })
+
+        state = self.hass.states.get('binary_sensor.test')
+        assert STATE_OFF == state.state
+
+        fire_mqtt_message(self.hass, 'test-topic', '')
+        self.hass.block_till_done()
+        state = self.hass.states.get('binary_sensor.test')
+        assert STATE_ON == state.state
+
+        fire_mqtt_message(self.hass, 'test-topic', '')
+        self.hass.block_till_done()
+        state = self.hass.states.get('binary_sensor.test')
+        assert STATE_OFF == state.state
+
     def test_valid_device_class(self):
         """Test the setting of a valid sensor class."""
         assert setup_component(self.hass, binary_sensor.DOMAIN, {
@@ -256,6 +283,67 @@ class TestSensorMQTT(unittest.TestCase):
         assert STATE_OFF == state.state
         assert 3 == len(events)
 
+    def test_setting_sensor_attribute_via_mqtt_json_message(self):
+        """Test the setting of attribute via MQTT with JSON payload."""
+        mock_component(self.hass, 'mqtt')
+        assert setup_component(self.hass, binary_sensor.DOMAIN, {
+            binary_sensor.DOMAIN: {
+                'platform': 'mqtt',
+                'name': 'test',
+                'state_topic': 'test-topic',
+                'json_attributes_topic': 'attr-topic'
+            }
+        })
+
+        fire_mqtt_message(self.hass, 'attr-topic', '{ "val": "100" }')
+        self.hass.block_till_done()
+        state = self.hass.states.get('binary_sensor.test')
+
+        assert '100' == \
+            state.attributes.get('val')
+
+    @patch('homeassistant.components.mqtt._LOGGER')
+    def test_update_with_json_attrs_not_dict(self, mock_logger):
+        """Test attributes get extracted from a JSON result."""
+        mock_component(self.hass, 'mqtt')
+        assert setup_component(self.hass, binary_sensor.DOMAIN, {
+            binary_sensor.DOMAIN: {
+                'platform': 'mqtt',
+                'name': 'test',
+                'state_topic': 'test-topic',
+                'json_attributes_topic': 'attr-topic'
+            }
+        })
+
+        fire_mqtt_message(self.hass, 'attr-topic', '[ "list", "of", "things"]')
+        self.hass.block_till_done()
+        state = self.hass.states.get('binary_sensor.test')
+
+        assert state.attributes.get('val') is None
+        mock_logger.warning.assert_called_with(
+            'JSON result was not a dictionary')
+
+    @patch('homeassistant.components.mqtt._LOGGER')
+    def test_update_with_json_attrs_bad_JSON(self, mock_logger):
+        """Test attributes get extracted from a JSON result."""
+        mock_component(self.hass, 'mqtt')
+        assert setup_component(self.hass, binary_sensor.DOMAIN, {
+            binary_sensor.DOMAIN: {
+                'platform': 'mqtt',
+                'name': 'test',
+                'state_topic': 'test-topic',
+                'json_attributes_topic': 'attr-topic'
+            }
+        })
+
+        fire_mqtt_message(self.hass, 'attr-topic', 'This is not JSON')
+        self.hass.block_till_done()
+
+        state = self.hass.states.get('binary_sensor.test')
+        assert state.attributes.get('val') is None
+        mock_logger.warning.assert_called_with(
+            'Erroneous JSON: %s', 'This is not JSON')
+
 
 async def test_unique_id(hass):
     """Test unique id option only creates one sensor per unique_id."""
@@ -369,3 +457,39 @@ async def test_entity_device_info_with_identifier(hass, mqtt_mock):
     assert device.name == 'Beer'
     assert device.model == 'Glass'
     assert device.sw_version == '0.1-beta'
+
+
+async def test_entity_id_update(hass, mqtt_mock):
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    registry = mock_registry(hass, {})
+    mock_mqtt = await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, binary_sensor.DOMAIN, {
+        binary_sensor.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'beer',
+            'state_topic': 'test-topic',
+            'availability_topic': 'avty-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+
+    state = hass.states.get('binary_sensor.beer')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.reset_mock()
+
+    registry.async_update_entity(
+        'binary_sensor.beer', new_entity_id='binary_sensor.milk')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    state = hass.states.get('binary_sensor.beer')
+    assert state is None
+
+    state = hass.states.get('binary_sensor.milk')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
diff --git a/tests/components/binary_sensor/test_rflink.py b/tests/components/binary_sensor/test_rflink.py
index 94f4208d5b8..98147ff7e6f 100644
--- a/tests/components/binary_sensor/test_rflink.py
+++ b/tests/components/binary_sensor/test_rflink.py
@@ -7,7 +7,6 @@ automatic sensor creation.
 from datetime import timedelta
 from unittest.mock import patch
 
-from ..test_rflink import mock_rflink
 from homeassistant.components.rflink import (
     CONF_RECONNECT_INTERVAL)
 
@@ -17,6 +16,7 @@ from homeassistant.const import (
 import homeassistant.util.dt as dt_util
 
 from tests.common import async_fire_time_changed
+from ..test_rflink import mock_rflink
 
 DOMAIN = 'binary_sensor'
 
@@ -46,7 +46,7 @@ CONFIG = {
 async def test_default_setup(hass, monkeypatch):
     """Test all basic functionality of the rflink sensor component."""
     # setup mocking rflink module
-    event_callback, create, _, disconnect_callback = await mock_rflink(
+    event_callback, create, _, _ = await mock_rflink(
         hass, CONFIG, DOMAIN, monkeypatch)
 
     # make sure arguments are passed
@@ -86,7 +86,7 @@ async def test_entity_availability(hass, monkeypatch):
     config[CONF_RECONNECT_INTERVAL] = 60
 
     # Create platform and entities
-    event_callback, create, _, disconnect_callback = await mock_rflink(
+    _, _, _, disconnect_callback = await mock_rflink(
         hass, config, DOMAIN, monkeypatch, failures=failures)
 
     # Entities are available by default
@@ -114,7 +114,7 @@ async def test_entity_availability(hass, monkeypatch):
 async def test_off_delay(hass, monkeypatch):
     """Test off_delay option."""
     # setup mocking rflink module
-    event_callback, create, _, disconnect_callback = await mock_rflink(
+    event_callback, create, _, _ = await mock_rflink(
         hass, CONFIG, DOMAIN, monkeypatch)
 
     # make sure arguments are passed
diff --git a/tests/components/climate/test_mqtt.py b/tests/components/climate/test_mqtt.py
index 7beb3887ae0..1fd45701a95 100644
--- a/tests/components/climate/test_mqtt.py
+++ b/tests/components/climate/test_mqtt.py
@@ -1,6 +1,8 @@
 """The tests for the mqtt climate component."""
-import unittest
 import copy
+import json
+import unittest
+from unittest.mock import ANY
 
 import pytest
 import voluptuous as vol
@@ -16,9 +18,10 @@ from homeassistant.components.climate import (
     SUPPORT_FAN_MODE, SUPPORT_SWING_MODE, SUPPORT_HOLD_MODE,
     SUPPORT_AWAY_MODE, SUPPORT_AUX_HEAT, DEFAULT_MIN_TEMP, DEFAULT_MAX_TEMP)
 from homeassistant.components.mqtt.discovery import async_start
-from tests.common import (get_test_home_assistant, mock_mqtt_component,
-                          async_fire_mqtt_message, fire_mqtt_message,
-                          mock_component, MockConfigEntry)
+from tests.common import (
+    async_fire_mqtt_message, async_mock_mqtt_component, async_setup_component,
+    fire_mqtt_message, get_test_home_assistant, mock_component,
+    mock_mqtt_component, MockConfigEntry, mock_registry)
 from tests.components.climate import common
 
 ENTITY_CLIMATE = 'climate.test'
@@ -671,6 +674,29 @@ class TestMQTTClimate(unittest.TestCase):
         assert 0.01 == temp_step
 
 
+async def test_unique_id(hass):
+    """Test unique id option only creates one climate per unique_id."""
+    await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, climate.DOMAIN, {
+        climate.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'Test 1',
+            'status_topic': 'test-topic',
+            'command_topic': 'test_topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }, {
+            'platform': 'mqtt',
+            'name': 'Test 2',
+            'status_topic': 'test-topic',
+            'command_topic': 'test_topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+    async_fire_mqtt_message(hass, 'test-topic', 'payload')
+    await hass.async_block_till_done()
+    assert len(hass.states.async_entity_ids(climate.DOMAIN)) == 1
+
+
 async def test_discovery_removal_climate(hass, mqtt_mock, caplog):
     """Test removal of discovered climate."""
     entry = MockConfigEntry(domain=mqtt.DOMAIN)
@@ -721,3 +747,77 @@ async def test_discovery_update_climate(hass, mqtt_mock, caplog):
 
     state = hass.states.get('climate.milk')
     assert state is None
+
+
+async def test_entity_device_info_with_identifier(hass, mqtt_mock):
+    """Test MQTT climate device registry integration."""
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+    entry.add_to_hass(hass)
+    await async_start(hass, 'homeassistant', {}, entry)
+    registry = await hass.helpers.device_registry.async_get_registry()
+
+    data = json.dumps({
+        'platform': 'mqtt',
+        'name': 'Test 1',
+        'state_topic': 'test-topic',
+        'command_topic': 'test-topic',
+        'device': {
+            'identifiers': ['helloworld'],
+            'connections': [
+                ["mac", "02:5b:26:a8:dc:12"],
+            ],
+            'manufacturer': 'Whatever',
+            'name': 'Beer',
+            'model': 'Glass',
+            'sw_version': '0.1-beta',
+        },
+        'unique_id': 'veryunique'
+    })
+    async_fire_mqtt_message(hass, 'homeassistant/climate/bla/config',
+                            data)
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    device = registry.async_get_device({('mqtt', 'helloworld')}, set())
+    assert device is not None
+    assert device.identifiers == {('mqtt', 'helloworld')}
+    assert device.connections == {('mac', "02:5b:26:a8:dc:12")}
+    assert device.manufacturer == 'Whatever'
+    assert device.name == 'Beer'
+    assert device.model == 'Glass'
+    assert device.sw_version == '0.1-beta'
+
+
+async def test_entity_id_update(hass, mqtt_mock):
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    registry = mock_registry(hass, {})
+    mock_mqtt = await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, climate.DOMAIN, {
+        climate.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'beer',
+            'mode_state_topic': 'test-topic',
+            'availability_topic': 'avty-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+
+    state = hass.states.get('climate.beer')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.reset_mock()
+
+    registry.async_update_entity('climate.beer', new_entity_id='climate.milk')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    state = hass.states.get('climate.beer')
+    assert state is None
+
+    state = hass.states.get('climate.milk')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
diff --git a/tests/components/config/test_auth.py b/tests/components/config/test_auth.py
index b5e0a8c9197..5cc7b4bd82e 100644
--- a/tests/components/config/test_auth.py
+++ b/tests/components/config/test_auth.py
@@ -13,9 +13,10 @@ def setup_config(hass, aiohttp_client):
     hass.loop.run_until_complete(auth_config.async_setup(hass))
 
 
-async def test_list_requires_owner(hass, hass_ws_client, hass_access_token):
+async def test_list_requires_admin(hass, hass_ws_client,
+                                   hass_read_only_access_token):
     """Test get users requires auth."""
-    client = await hass_ws_client(hass, hass_access_token)
+    client = await hass_ws_client(hass, hass_read_only_access_token)
 
     await client.send_json({
         'id': 5,
@@ -109,9 +110,10 @@ async def test_list(hass, hass_ws_client, hass_admin_user):
     }
 
 
-async def test_delete_requires_owner(hass, hass_ws_client, hass_access_token):
+async def test_delete_requires_admin(hass, hass_ws_client,
+                                     hass_read_only_access_token):
     """Test delete command requires an owner."""
-    client = await hass_ws_client(hass, hass_access_token)
+    client = await hass_ws_client(hass, hass_read_only_access_token)
 
     await client.send_json({
         'id': 5,
@@ -139,15 +141,12 @@ async def test_delete_unable_self_account(hass, hass_ws_client,
 
     result = await client.receive_json()
     assert not result['success'], result
-    assert result['error']['code'] == 'unauthorized'
+    assert result['error']['code'] == 'no_delete_self'
 
 
 async def test_delete_unknown_user(hass, hass_ws_client, hass_access_token):
     """Test we cannot delete an unknown user."""
     client = await hass_ws_client(hass, hass_access_token)
-    refresh_token = await hass.auth.async_validate_access_token(
-        hass_access_token)
-    refresh_token.user.is_owner = True
 
     await client.send_json({
         'id': 5,
@@ -163,9 +162,6 @@ async def test_delete_unknown_user(hass, hass_ws_client, hass_access_token):
 async def test_delete(hass, hass_ws_client, hass_access_token):
     """Test delete command works."""
     client = await hass_ws_client(hass, hass_access_token)
-    refresh_token = await hass.auth.async_validate_access_token(
-        hass_access_token)
-    refresh_token.user.is_owner = True
     test_user = MockUser(
         id='efg',
     ).add_to_hass(hass)
@@ -186,9 +182,6 @@ async def test_delete(hass, hass_ws_client, hass_access_token):
 async def test_create(hass, hass_ws_client, hass_access_token):
     """Test create command works."""
     client = await hass_ws_client(hass, hass_access_token)
-    refresh_token = await hass.auth.async_validate_access_token(
-        hass_access_token)
-    refresh_token.user.is_owner = True
 
     assert len(await hass.auth.async_get_users()) == 1
 
@@ -210,9 +203,10 @@ async def test_create(hass, hass_ws_client, hass_access_token):
     assert not user.system_generated
 
 
-async def test_create_requires_owner(hass, hass_ws_client, hass_access_token):
+async def test_create_requires_admin(hass, hass_ws_client,
+                                     hass_read_only_access_token):
     """Test create command requires an owner."""
-    client = await hass_ws_client(hass, hass_access_token)
+    client = await hass_ws_client(hass, hass_read_only_access_token)
 
     await client.send_json({
         'id': 5,
diff --git a/tests/components/config/test_auth_provider_homeassistant.py b/tests/components/config/test_auth_provider_homeassistant.py
index a374083c2ab..a4c4c5a3c5a 100644
--- a/tests/components/config/test_auth_provider_homeassistant.py
+++ b/tests/components/config/test_auth_provider_homeassistant.py
@@ -22,9 +22,6 @@ async def test_create_auth_system_generated_user(hass, hass_access_token,
     """Test we can't add auth to system generated users."""
     system_user = MockUser(system_generated=True).add_to_hass(hass)
     client = await hass_ws_client(hass, hass_access_token)
-    refresh_token = await hass.auth.async_validate_access_token(
-        hass_access_token)
-    refresh_token.user.is_owner = True
 
     await client.send_json({
         'id': 5,
@@ -49,9 +46,6 @@ async def test_create_auth_unknown_user(hass_ws_client, hass,
                                         hass_access_token):
     """Test create pointing at unknown user."""
     client = await hass_ws_client(hass, hass_access_token)
-    refresh_token = await hass.auth.async_validate_access_token(
-        hass_access_token)
-    refresh_token.user.is_owner = True
 
     await client.send_json({
         'id': 5,
@@ -67,10 +61,10 @@ async def test_create_auth_unknown_user(hass_ws_client, hass,
     assert result['error']['code'] == 'not_found'
 
 
-async def test_create_auth_requires_owner(hass, hass_ws_client,
-                                          hass_access_token):
-    """Test create requires owner to call API."""
-    client = await hass_ws_client(hass, hass_access_token)
+async def test_create_auth_requires_admin(hass, hass_ws_client,
+                                          hass_read_only_access_token):
+    """Test create requires admin to call API."""
+    client = await hass_ws_client(hass, hass_read_only_access_token)
 
     await client.send_json({
         'id': 5,
@@ -90,9 +84,6 @@ async def test_create_auth(hass, hass_ws_client, hass_access_token,
     """Test create auth command works."""
     client = await hass_ws_client(hass, hass_access_token)
     user = MockUser().add_to_hass(hass)
-    refresh_token = await hass.auth.async_validate_access_token(
-        hass_access_token)
-    refresh_token.user.is_owner = True
 
     assert len(user.credentials) == 0
 
@@ -123,9 +114,6 @@ async def test_create_auth_duplicate_username(hass, hass_ws_client,
     """Test we can't create auth with a duplicate username."""
     client = await hass_ws_client(hass, hass_access_token)
     user = MockUser().add_to_hass(hass)
-    refresh_token = await hass.auth.async_validate_access_token(
-        hass_access_token)
-    refresh_token.user.is_owner = True
 
     hass_storage[prov_ha.STORAGE_KEY] = {
         'version': 1,
@@ -153,9 +141,6 @@ async def test_delete_removes_just_auth(hass_ws_client, hass, hass_storage,
                                         hass_access_token):
     """Test deleting an auth without being connected to a user."""
     client = await hass_ws_client(hass, hass_access_token)
-    refresh_token = await hass.auth.async_validate_access_token(
-        hass_access_token)
-    refresh_token.user.is_owner = True
 
     hass_storage[prov_ha.STORAGE_KEY] = {
         'version': 1,
@@ -181,9 +166,6 @@ async def test_delete_removes_credential(hass, hass_ws_client,
                                          hass_access_token, hass_storage):
     """Test deleting auth that is connected to a user."""
     client = await hass_ws_client(hass, hass_access_token)
-    refresh_token = await hass.auth.async_validate_access_token(
-        hass_access_token)
-    refresh_token.user.is_owner = True
 
     user = MockUser().add_to_hass(hass)
     user.credentials.append(
@@ -210,9 +192,10 @@ async def test_delete_removes_credential(hass, hass_ws_client,
     assert len(hass_storage[prov_ha.STORAGE_KEY]['data']['users']) == 0
 
 
-async def test_delete_requires_owner(hass, hass_ws_client, hass_access_token):
-    """Test delete requires owner."""
-    client = await hass_ws_client(hass, hass_access_token)
+async def test_delete_requires_admin(hass, hass_ws_client,
+                                     hass_read_only_access_token):
+    """Test delete requires admin."""
+    client = await hass_ws_client(hass, hass_read_only_access_token)
 
     await client.send_json({
         'id': 5,
@@ -228,9 +211,6 @@ async def test_delete_requires_owner(hass, hass_ws_client, hass_access_token):
 async def test_delete_unknown_auth(hass, hass_ws_client, hass_access_token):
     """Test trying to delete an unknown auth username."""
     client = await hass_ws_client(hass, hass_access_token)
-    refresh_token = await hass.auth.async_validate_access_token(
-        hass_access_token)
-    refresh_token.user.is_owner = True
 
     await client.send_json({
         'id': 5,
diff --git a/tests/components/config/test_config_entries.py b/tests/components/config/test_config_entries.py
index 0b36cc6bc87..be73906c1bf 100644
--- a/tests/components/config/test_config_entries.py
+++ b/tests/components/config/test_config_entries.py
@@ -84,6 +84,17 @@ def test_remove_entry(hass, client):
     assert len(hass.config_entries.async_entries()) == 0
 
 
+async def test_remove_entry_unauth(hass, client, hass_admin_user):
+    """Test removing an entry via the API."""
+    hass_admin_user.groups = []
+    entry = MockConfigEntry(domain='demo', state=core_ce.ENTRY_STATE_LOADED)
+    entry.add_to_hass(hass)
+    resp = await client.delete(
+        '/api/config/config_entries/entry/{}'.format(entry.entry_id))
+    assert resp.status == 401
+    assert len(hass.config_entries.async_entries()) == 1
+
+
 @asyncio.coroutine
 def test_available_flows(hass, client):
     """Test querying the available flows."""
@@ -155,6 +166,35 @@ def test_initialize_flow(hass, client):
     }
 
 
+async def test_initialize_flow_unauth(hass, client, hass_admin_user):
+    """Test we can initialize a flow."""
+    hass_admin_user.groups = []
+
+    class TestFlow(core_ce.ConfigFlow):
+        @asyncio.coroutine
+        def async_step_user(self, user_input=None):
+            schema = OrderedDict()
+            schema[vol.Required('username')] = str
+            schema[vol.Required('password')] = str
+
+            return self.async_show_form(
+                step_id='user',
+                data_schema=schema,
+                description_placeholders={
+                    'url': 'https://example.com',
+                },
+                errors={
+                    'username': 'Should be unique.'
+                }
+            )
+
+    with patch.dict(HANDLERS, {'test': TestFlow}):
+        resp = await client.post('/api/config/config_entries/flow',
+                                 json={'handler': 'test'})
+
+    assert resp.status == 401
+
+
 @asyncio.coroutine
 def test_abort(hass, client):
     """Test a flow that aborts."""
@@ -273,6 +313,58 @@ def test_two_step_flow(hass, client):
         }
 
 
+async def test_continue_flow_unauth(hass, client, hass_admin_user):
+    """Test we can't finish a two step flow."""
+    set_component(
+        hass, 'test',
+        MockModule('test', async_setup_entry=mock_coro_func(True)))
+
+    class TestFlow(core_ce.ConfigFlow):
+        VERSION = 1
+
+        @asyncio.coroutine
+        def async_step_user(self, user_input=None):
+            return self.async_show_form(
+                step_id='account',
+                data_schema=vol.Schema({
+                    'user_title': str
+                }))
+
+        @asyncio.coroutine
+        def async_step_account(self, user_input=None):
+            return self.async_create_entry(
+                title=user_input['user_title'],
+                data={'secret': 'account_token'},
+            )
+
+    with patch.dict(HANDLERS, {'test': TestFlow}):
+        resp = await client.post('/api/config/config_entries/flow',
+                                 json={'handler': 'test'})
+        assert resp.status == 200
+        data = await resp.json()
+        flow_id = data.pop('flow_id')
+        assert data == {
+            'type': 'form',
+            'handler': 'test',
+            'step_id': 'account',
+            'data_schema': [
+                {
+                    'name': 'user_title',
+                    'type': 'string'
+                }
+            ],
+            'description_placeholders': None,
+            'errors': None
+        }
+
+    hass_admin_user.groups = []
+
+    resp = await client.post(
+        '/api/config/config_entries/flow/{}'.format(flow_id),
+        json={'user_title': 'user-title'})
+    assert resp.status == 401
+
+
 @asyncio.coroutine
 def test_get_progress_index(hass, client):
     """Test querying for the flows that are in progress."""
@@ -305,6 +397,13 @@ def test_get_progress_index(hass, client):
     ]
 
 
+async def test_get_progress_index_unauth(hass, client, hass_admin_user):
+    """Test we can't get flows that are in progress."""
+    hass_admin_user.groups = []
+    resp = await client.get('/api/config/config_entries/flow')
+    assert resp.status == 401
+
+
 @asyncio.coroutine
 def test_get_progress_flow(hass, client):
     """Test we can query the API for same result as we get from init a flow."""
@@ -337,3 +436,34 @@ def test_get_progress_flow(hass, client):
     data2 = yield from resp2.json()
 
     assert data == data2
+
+
+async def test_get_progress_flow_unauth(hass, client, hass_admin_user):
+    """Test we can can't query the API for result of flow."""
+    class TestFlow(core_ce.ConfigFlow):
+        async def async_step_user(self, user_input=None):
+            schema = OrderedDict()
+            schema[vol.Required('username')] = str
+            schema[vol.Required('password')] = str
+
+            return self.async_show_form(
+                step_id='user',
+                data_schema=schema,
+                errors={
+                    'username': 'Should be unique.'
+                }
+            )
+
+    with patch.dict(HANDLERS, {'test': TestFlow}):
+        resp = await client.post('/api/config/config_entries/flow',
+                                 json={'handler': 'test'})
+
+    assert resp.status == 200
+    data = await resp.json()
+
+    hass_admin_user.groups = []
+
+    resp2 = await client.get(
+        '/api/config/config_entries/flow/{}'.format(data['flow_id']))
+
+    assert resp2.status == 401
diff --git a/tests/components/cover/test_mqtt.py b/tests/components/cover/test_mqtt.py
index df47a6caf48..a31f393c507 100644
--- a/tests/components/cover/test_mqtt.py
+++ b/tests/components/cover/test_mqtt.py
@@ -1,6 +1,7 @@
 """The tests for the MQTT cover platform."""
 import json
 import unittest
+from unittest.mock import ANY
 
 from homeassistant.components import cover, mqtt
 from homeassistant.components.cover import (ATTR_POSITION, ATTR_TILT_POSITION)
@@ -16,7 +17,8 @@ from homeassistant.setup import setup_component, async_setup_component
 
 from tests.common import (
     get_test_home_assistant, mock_mqtt_component, async_fire_mqtt_message,
-    fire_mqtt_message, MockConfigEntry, async_mock_mqtt_component)
+    fire_mqtt_message, MockConfigEntry, async_mock_mqtt_component,
+    mock_registry)
 
 
 class TestCoverMQTT(unittest.TestCase):
@@ -1156,3 +1158,38 @@ async def test_entity_device_info_with_identifier(hass, mqtt_mock):
     assert device.name == 'Beer'
     assert device.model == 'Glass'
     assert device.sw_version == '0.1-beta'
+
+
+async def test_entity_id_update(hass, mqtt_mock):
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    registry = mock_registry(hass, {})
+    mock_mqtt = await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, cover.DOMAIN, {
+        cover.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'beer',
+            'state_topic': 'test-topic',
+            'availability_topic': 'avty-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+
+    state = hass.states.get('cover.beer')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.reset_mock()
+
+    registry.async_update_entity('cover.beer', new_entity_id='cover.milk')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    state = hass.states.get('cover.beer')
+    assert state is None
+
+    state = hass.states.get('cover.milk')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
diff --git a/tests/components/cover/test_rflink.py b/tests/components/cover/test_rflink.py
new file mode 100644
index 00000000000..4f88d24d97f
--- /dev/null
+++ b/tests/components/cover/test_rflink.py
@@ -0,0 +1,497 @@
+"""Test for RFLink cover components.
+
+Test setup of RFLink covers component/platform. State tracking and
+control of RFLink cover devices.
+
+"""
+
+import logging
+
+from homeassistant.components.rflink import EVENT_BUTTON_PRESSED
+from homeassistant.const import (
+    SERVICE_OPEN_COVER, SERVICE_CLOSE_COVER,
+    STATE_OPEN, STATE_CLOSED, ATTR_ENTITY_ID)
+from homeassistant.core import callback, State, CoreState
+
+from tests.common import mock_restore_cache
+from ..test_rflink import mock_rflink
+
+DOMAIN = 'cover'
+
+CONFIG = {
+    'rflink': {
+        'port': '/dev/ttyABC0',
+        'ignore_devices': ['ignore_wildcard_*', 'ignore_cover'],
+    },
+    DOMAIN: {
+        'platform': 'rflink',
+        'devices': {
+            'protocol_0_0': {
+                'name': 'test',
+                'aliases': ['test_alias_0_0'],
+            },
+            'cover_0_0': {
+                'name': 'dim_test',
+            },
+            'cover_0_1': {
+                'name': 'cover_test',
+            }
+        },
+    },
+}
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def test_default_setup(hass, monkeypatch):
+    """Test all basic functionality of the RFLink cover component."""
+    # setup mocking rflink module
+    event_callback, create, protocol, _ = await mock_rflink(
+        hass, CONFIG, DOMAIN, monkeypatch)
+
+    # make sure arguments are passed
+    assert create.call_args_list[0][1]['ignore']
+
+    # test default state of cover loaded from config
+    cover_initial = hass.states.get(DOMAIN + '.test')
+    assert cover_initial.state == STATE_CLOSED
+    assert cover_initial.attributes['assumed_state']
+
+    # cover should follow state of the hardware device by interpreting
+    # incoming events for its name and aliases
+
+    # mock incoming command event for this device
+    event_callback({
+        'id': 'protocol_0_0',
+        'command': 'up',
+    })
+    await hass.async_block_till_done()
+
+    cover_after_first_command = hass.states.get(DOMAIN + '.test')
+    assert cover_after_first_command.state == STATE_OPEN
+    # not sure why, but cover have always assumed_state=true
+    assert cover_after_first_command.attributes.get('assumed_state')
+
+    # mock incoming command event for this device
+    event_callback({
+        'id': 'protocol_0_0',
+        'command': 'down',
+    })
+    await hass.async_block_till_done()
+
+    assert hass.states.get(DOMAIN + '.test').state == STATE_CLOSED
+
+    # should respond to group command
+    event_callback({
+        'id': 'protocol_0_0',
+        'command': 'allon',
+    })
+    await hass.async_block_till_done()
+
+    cover_after_first_command = hass.states.get(DOMAIN + '.test')
+    assert cover_after_first_command.state == STATE_OPEN
+
+    # should respond to group command
+    event_callback({
+        'id': 'protocol_0_0',
+        'command': 'alloff',
+    })
+    await hass.async_block_till_done()
+
+    assert hass.states.get(DOMAIN + '.test').state == STATE_CLOSED
+
+    # test following aliases
+    # mock incoming command event for this device alias
+    event_callback({
+        'id': 'test_alias_0_0',
+        'command': 'up',
+    })
+    await hass.async_block_till_done()
+
+    assert hass.states.get(DOMAIN + '.test').state == STATE_OPEN
+
+    # test changing state from HA propagates to RFLink
+    hass.async_create_task(
+        hass.services.async_call(DOMAIN, SERVICE_CLOSE_COVER,
+                                 {ATTR_ENTITY_ID: DOMAIN + '.test'}))
+    await hass.async_block_till_done()
+    assert hass.states.get(DOMAIN + '.test').state == STATE_CLOSED
+    assert protocol.send_command_ack.call_args_list[0][0][0] == 'protocol_0_0'
+    assert protocol.send_command_ack.call_args_list[0][0][1] == 'DOWN'
+
+    hass.async_create_task(
+        hass.services.async_call(DOMAIN, SERVICE_OPEN_COVER,
+                                 {ATTR_ENTITY_ID: DOMAIN + '.test'}))
+    await hass.async_block_till_done()
+    assert hass.states.get(DOMAIN + '.test').state == STATE_OPEN
+    assert protocol.send_command_ack.call_args_list[1][0][1] == 'UP'
+
+
+async def test_firing_bus_event(hass, monkeypatch):
+    """Incoming RFLink command events should be put on the HA event bus."""
+    config = {
+        'rflink': {
+            'port': '/dev/ttyABC0',
+        },
+        DOMAIN: {
+            'platform': 'rflink',
+            'devices': {
+                'protocol_0_0': {
+                    'name': 'test',
+                    'aliases': ['test_alias_0_0'],
+                    'fire_event': True,
+                },
+            },
+        },
+    }
+
+    # setup mocking rflink module
+    event_callback, _, _, _ = await mock_rflink(
+        hass, config, DOMAIN, monkeypatch)
+
+    calls = []
+
+    @callback
+    def listener(event):
+        calls.append(event)
+    hass.bus.async_listen_once(EVENT_BUTTON_PRESSED, listener)
+
+    # test event for new unconfigured sensor
+    event_callback({
+        'id': 'protocol_0_0',
+        'command': 'down',
+    })
+    await hass.async_block_till_done()
+
+    assert calls[0].data == {'state': 'down', 'entity_id': DOMAIN + '.test'}
+
+
+async def test_signal_repetitions(hass, monkeypatch):
+    """Command should be sent amount of configured repetitions."""
+    config = {
+        'rflink': {
+            'port': '/dev/ttyABC0',
+        },
+        DOMAIN: {
+            'platform': 'rflink',
+            'device_defaults': {
+                'signal_repetitions': 3,
+            },
+            'devices': {
+                'protocol_0_0': {
+                    'name': 'test',
+                    'signal_repetitions': 2,
+                },
+                'protocol_0_1': {
+                    'name': 'test1',
+                },
+            },
+        },
+    }
+
+    # setup mocking rflink module
+    _, _, protocol, _ = await mock_rflink(hass, config, DOMAIN, monkeypatch)
+
+    # test if signal repetition is performed according to configuration
+    hass.async_create_task(
+        hass.services.async_call(DOMAIN, SERVICE_OPEN_COVER,
+                                 {ATTR_ENTITY_ID: DOMAIN + '.test'}))
+
+    # wait for commands and repetitions to finish
+    await hass.async_block_till_done()
+
+    assert protocol.send_command_ack.call_count == 2
+
+    # test if default apply to configured devices
+    hass.async_create_task(
+        hass.services.async_call(DOMAIN, SERVICE_OPEN_COVER,
+                                 {ATTR_ENTITY_ID: DOMAIN + '.test1'}))
+
+    # wait for commands and repetitions to finish
+    await hass.async_block_till_done()
+
+    assert protocol.send_command_ack.call_count == 5
+
+
+async def test_signal_repetitions_alternation(hass, monkeypatch):
+    """Simultaneously switching entities must alternate repetitions."""
+    config = {
+        'rflink': {
+            'port': '/dev/ttyABC0',
+        },
+        DOMAIN: {
+            'platform': 'rflink',
+            'devices': {
+                'protocol_0_0': {
+                    'name': 'test',
+                    'signal_repetitions': 2,
+                },
+                'protocol_0_1': {
+                    'name': 'test1',
+                    'signal_repetitions': 2,
+                },
+            },
+        },
+    }
+
+    # setup mocking rflink module
+    _, _, protocol, _ = await mock_rflink(
+        hass, config, DOMAIN, monkeypatch)
+
+    hass.async_create_task(
+        hass.services.async_call(DOMAIN, SERVICE_CLOSE_COVER,
+                                 {ATTR_ENTITY_ID: DOMAIN + '.test'}))
+    hass.async_create_task(
+        hass.services.async_call(DOMAIN, SERVICE_CLOSE_COVER,
+                                 {ATTR_ENTITY_ID: DOMAIN + '.test1'}))
+
+    await hass.async_block_till_done()
+
+    assert protocol.send_command_ack.call_args_list[0][0][0] == 'protocol_0_0'
+    assert protocol.send_command_ack.call_args_list[1][0][0] == 'protocol_0_1'
+    assert protocol.send_command_ack.call_args_list[2][0][0] == 'protocol_0_0'
+    assert protocol.send_command_ack.call_args_list[3][0][0] == 'protocol_0_1'
+
+
+async def test_signal_repetitions_cancelling(hass, monkeypatch):
+    """Cancel outstanding repetitions when state changed."""
+    config = {
+        'rflink': {
+            'port': '/dev/ttyABC0',
+        },
+        DOMAIN: {
+            'platform': 'rflink',
+            'devices': {
+                'protocol_0_0': {
+                    'name': 'test',
+                    'signal_repetitions': 3,
+                },
+            },
+        },
+    }
+
+    # setup mocking rflink module
+    _, _, protocol, _ = await mock_rflink(
+        hass, config, DOMAIN, monkeypatch)
+
+    hass.async_create_task(
+        hass.services.async_call(DOMAIN, SERVICE_CLOSE_COVER,
+                                 {ATTR_ENTITY_ID: DOMAIN + '.test'}))
+
+    hass.async_create_task(
+        hass.services.async_call(DOMAIN, SERVICE_OPEN_COVER,
+                                 {ATTR_ENTITY_ID: DOMAIN + '.test'}))
+
+    await hass.async_block_till_done()
+
+    assert protocol.send_command_ack.call_args_list[0][0][1] == 'DOWN'
+    assert protocol.send_command_ack.call_args_list[1][0][1] == 'UP'
+    assert protocol.send_command_ack.call_args_list[2][0][1] == 'UP'
+    assert protocol.send_command_ack.call_args_list[3][0][1] == 'UP'
+
+
+async def test_group_alias(hass, monkeypatch):
+    """Group aliases should only respond to group commands (allon/alloff)."""
+    config = {
+        'rflink': {
+            'port': '/dev/ttyABC0',
+        },
+        DOMAIN: {
+            'platform': 'rflink',
+            'devices': {
+                'protocol_0_0': {
+                    'name': 'test',
+                    'group_aliases': ['test_group_0_0'],
+                },
+            },
+        },
+    }
+
+    # setup mocking rflink module
+    event_callback, _, _, _ = await mock_rflink(
+        hass, config, DOMAIN, monkeypatch)
+
+    assert hass.states.get(DOMAIN + '.test').state == STATE_CLOSED
+
+    # test sending group command to group alias
+    event_callback({
+        'id': 'test_group_0_0',
+        'command': 'allon',
+    })
+    await hass.async_block_till_done()
+
+    assert hass.states.get(DOMAIN + '.test').state == STATE_OPEN
+
+    # test sending group command to group alias
+    event_callback({
+        'id': 'test_group_0_0',
+        'command': 'down',
+    })
+    await hass.async_block_till_done()
+
+    assert hass.states.get(DOMAIN + '.test').state == STATE_OPEN
+
+
+async def test_nogroup_alias(hass, monkeypatch):
+    """Non group aliases should not respond to group commands."""
+    config = {
+        'rflink': {
+            'port': '/dev/ttyABC0',
+        },
+        DOMAIN: {
+            'platform': 'rflink',
+            'devices': {
+                'protocol_0_0': {
+                    'name': 'test',
+                    'nogroup_aliases': ['test_nogroup_0_0'],
+                },
+            },
+        },
+    }
+
+    # setup mocking rflink module
+    event_callback, _, _, _ = await mock_rflink(
+        hass, config, DOMAIN, monkeypatch)
+
+    assert hass.states.get(DOMAIN + '.test').state == STATE_CLOSED
+
+    # test sending group command to nogroup alias
+    event_callback({
+        'id': 'test_nogroup_0_0',
+        'command': 'allon',
+    })
+    await hass.async_block_till_done()
+    # should not affect state
+    assert hass.states.get(DOMAIN + '.test').state == STATE_CLOSED
+
+    # test sending group command to nogroup alias
+    event_callback({
+        'id': 'test_nogroup_0_0',
+        'command': 'up',
+    })
+    await hass.async_block_till_done()
+    # should affect state
+    assert hass.states.get(DOMAIN + '.test').state == STATE_OPEN
+
+
+async def test_nogroup_device_id(hass, monkeypatch):
+    """Device id that do not respond to group commands (allon/alloff)."""
+    config = {
+        'rflink': {
+            'port': '/dev/ttyABC0',
+        },
+        DOMAIN: {
+            'platform': 'rflink',
+            'devices': {
+                'test_nogroup_0_0': {
+                    'name': 'test',
+                    'group': False,
+                },
+            },
+        },
+    }
+
+    # setup mocking rflink module
+    event_callback, _, _, _ = await mock_rflink(
+        hass, config, DOMAIN, monkeypatch)
+
+    assert hass.states.get(DOMAIN + '.test').state == STATE_CLOSED
+
+    # test sending group command to nogroup
+    event_callback({
+        'id': 'test_nogroup_0_0',
+        'command': 'allon',
+    })
+    await hass.async_block_till_done()
+    # should not affect state
+    assert hass.states.get(DOMAIN + '.test').state == STATE_CLOSED
+
+    # test sending group command to nogroup
+    event_callback({
+        'id': 'test_nogroup_0_0',
+        'command': 'up',
+    })
+    await hass.async_block_till_done()
+    # should affect state
+    assert hass.states.get(DOMAIN + '.test').state == STATE_OPEN
+
+
+async def test_disable_automatic_add(hass, monkeypatch):
+    """If disabled new devices should not be automatically added."""
+    config = {
+        'rflink': {
+            'port': '/dev/ttyABC0',
+        },
+        DOMAIN: {
+            'platform': 'rflink',
+            'automatic_add': False,
+        },
+    }
+
+    # setup mocking rflink module
+    event_callback, _, _, _ = await mock_rflink(
+        hass, config, DOMAIN, monkeypatch)
+
+    # test event for new unconfigured sensor
+    event_callback({
+        'id': 'protocol_0_0',
+        'command': 'down',
+    })
+    await hass.async_block_till_done()
+
+    # make sure new device is not added
+    assert not hass.states.get(DOMAIN + '.protocol_0_0')
+
+
+async def test_restore_state(hass, monkeypatch):
+    """Ensure states are restored on startup."""
+    config = {
+        'rflink': {
+            'port': '/dev/ttyABC0',
+        },
+        DOMAIN: {
+            'platform': 'rflink',
+            'devices': {
+                'RTS_12345678_0': {
+                    'name': 'c1',
+                },
+                'test_restore_2': {
+                    'name': 'c2',
+                },
+                'test_restore_3': {
+                    'name': 'c3',
+                },
+                'test_restore_4': {
+                    'name': 'c4',
+                },
+            },
+        },
+    }
+
+    mock_restore_cache(hass, (
+        State(DOMAIN + '.c1', STATE_OPEN, ),
+        State(DOMAIN + '.c2', STATE_CLOSED, ),
+    ))
+
+    hass.state = CoreState.starting
+
+    # setup mocking rflink module
+    _, _, _, _ = await mock_rflink(hass, config, DOMAIN, monkeypatch)
+
+    state = hass.states.get(DOMAIN + '.c1')
+    assert state
+    assert state.state == STATE_OPEN
+
+    state = hass.states.get(DOMAIN + '.c2')
+    assert state
+    assert state.state == STATE_CLOSED
+
+    state = hass.states.get(DOMAIN + '.c3')
+    assert state
+    assert state.state == STATE_CLOSED
+
+    # not cached cover must default values
+    state = hass.states.get(DOMAIN + '.c4')
+    assert state
+    assert state.state == STATE_CLOSED
+    assert state.attributes['assumed_state']
diff --git a/tests/components/daikin/__init__.py b/tests/components/daikin/__init__.py
new file mode 100644
index 00000000000..f56a38dd38c
--- /dev/null
+++ b/tests/components/daikin/__init__.py
@@ -0,0 +1 @@
+"""Tests for the Daikin component."""
diff --git a/tests/components/daikin/test_config_flow.py b/tests/components/daikin/test_config_flow.py
new file mode 100644
index 00000000000..f4ad676b9aa
--- /dev/null
+++ b/tests/components/daikin/test_config_flow.py
@@ -0,0 +1,93 @@
+# pylint: disable=W0621
+"""Tests for the Daikin config flow."""
+import asyncio
+
+import pytest
+
+from homeassistant import data_entry_flow
+from homeassistant.components.daikin import config_flow
+from homeassistant.components.daikin.const import KEY_HOST, KEY_IP, KEY_MAC
+
+from tests.common import MockConfigEntry, MockDependency
+
+MAC = 'AABBCCDDEEFF'
+HOST = '127.0.0.1'
+
+
+def init_config_flow(hass):
+    """Init a configuration flow."""
+    flow = config_flow.FlowHandler()
+    flow.hass = hass
+    return flow
+
+
+@pytest.fixture
+def mock_daikin():
+    """Mock tellduslive."""
+    with MockDependency('pydaikin.appliance') as mock_daikin_:
+        mock_daikin_.Appliance().values.get.return_value = 'AABBCCDDEEFF'
+        yield mock_daikin_
+
+
+async def test_user(hass, mock_daikin):
+    """Test user config."""
+    flow = init_config_flow(hass)
+
+    result = await flow.async_step_user()
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['step_id'] == 'user'
+
+    result = await flow.async_step_user({KEY_HOST: HOST})
+    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result['title'] == HOST
+    assert result['data'][KEY_HOST] == HOST
+    assert result['data'][KEY_MAC] == MAC
+
+
+async def test_abort_if_already_setup(hass, mock_daikin):
+    """Test we abort if Daikin is already setup."""
+    flow = init_config_flow(hass)
+    MockConfigEntry(domain='daikin', data={KEY_MAC: MAC}).add_to_hass(hass)
+
+    result = await flow.async_step_user({KEY_HOST: HOST})
+    assert result['type'] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result['reason'] == 'already_configured'
+
+
+async def test_import(hass, mock_daikin):
+    """Test import step."""
+    flow = init_config_flow(hass)
+
+    result = await flow.async_step_import({})
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['step_id'] == 'user'
+
+    result = await flow.async_step_import({KEY_HOST: HOST})
+    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result['title'] == HOST
+    assert result['data'][KEY_HOST] == HOST
+    assert result['data'][KEY_MAC] == MAC
+
+
+async def test_discovery(hass, mock_daikin):
+    """Test discovery step."""
+    flow = init_config_flow(hass)
+
+    result = await flow.async_step_discovery({KEY_IP: HOST, KEY_MAC: MAC})
+    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result['title'] == HOST
+    assert result['data'][KEY_HOST] == HOST
+    assert result['data'][KEY_MAC] == MAC
+
+
+@pytest.mark.parametrize('s_effect,reason',
+                         [(asyncio.TimeoutError, 'device_timeout'),
+                          (Exception, 'device_fail')])
+async def test_device_abort(hass, mock_daikin, s_effect, reason):
+    """Test device abort."""
+    flow = init_config_flow(hass)
+    mock_daikin.Appliance.side_effect = s_effect
+
+    result = await flow.async_step_user({KEY_HOST: HOST})
+    assert result['type'] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result['reason'] == reason
diff --git a/tests/components/device_tracker/test_init.py b/tests/components/device_tracker/test_init.py
index 6f0d881d257..e5fbced7293 100644
--- a/tests/components/device_tracker/test_init.py
+++ b/tests/components/device_tracker/test_init.py
@@ -408,10 +408,10 @@ async def test_see_state(hass, yaml_devices):
                                                     timedelta(seconds=0))
     assert len(config) == 1
 
-    state = hass.states.get('device_tracker.examplecom')
+    state = hass.states.get('device_tracker.example_com')
     attrs = state.attributes
     assert state.state == 'Work'
-    assert state.object_id == 'examplecom'
+    assert state.object_id == 'example_com'
     assert state.name == 'example.com'
     assert attrs['friendly_name'] == 'example.com'
     assert attrs['battery'] == 100
diff --git a/tests/components/device_tracker/test_meraki.py b/tests/components/device_tracker/test_meraki.py
index 582f112f69c..02b24c4c476 100644
--- a/tests/components/device_tracker/test_meraki.py
+++ b/tests/components/device_tracker/test_meraki.py
@@ -15,15 +15,19 @@ from homeassistant.components.device_tracker.meraki import URL
 @pytest.fixture
 def meraki_client(loop, hass, hass_client):
     """Meraki mock client."""
-    assert loop.run_until_complete(async_setup_component(
-        hass, device_tracker.DOMAIN, {
-            device_tracker.DOMAIN: {
-                CONF_PLATFORM: 'meraki',
-                CONF_VALIDATOR: 'validator',
-                CONF_SECRET: 'secret'
-
-            }
-        }))
+    assert loop.run_until_complete(
+        async_setup_component(
+            hass,
+            device_tracker.DOMAIN,
+            {
+                device_tracker.DOMAIN: {
+                    CONF_PLATFORM: "meraki",
+                    CONF_VALIDATOR: "validator",
+                    CONF_SECRET: "secret",
+                }
+            },
+        )
+    )
 
     yield loop.run_until_complete(hass_client())
 
@@ -34,53 +38,41 @@ def test_invalid_or_missing_data(mock_device_tracker_conf, meraki_client):
     req = yield from meraki_client.get(URL)
     text = yield from req.text()
     assert req.status == 200
-    assert text == 'validator'
+    assert text == "validator"
 
     req = yield from meraki_client.post(URL, data=b"invalid")
     text = yield from req.json()
     assert req.status == 400
-    assert text['message'] == 'Invalid JSON'
+    assert text["message"] == "Invalid JSON"
 
     req = yield from meraki_client.post(URL, data=b"{}")
     text = yield from req.json()
     assert req.status == 422
-    assert text['message'] == 'No secret'
+    assert text["message"] == "No secret"
 
-    data = {
-        "version": "1.0",
-        "secret": "secret"
-    }
+    data = {"version": "1.0", "secret": "secret"}
     req = yield from meraki_client.post(URL, data=json.dumps(data))
     text = yield from req.json()
     assert req.status == 422
-    assert text['message'] == 'Invalid version'
+    assert text["message"] == "Invalid version"
 
-    data = {
-        "version": "2.0",
-        "secret": "invalid"
-    }
+    data = {"version": "2.0", "secret": "invalid"}
     req = yield from meraki_client.post(URL, data=json.dumps(data))
     text = yield from req.json()
     assert req.status == 422
-    assert text['message'] == 'Invalid secret'
+    assert text["message"] == "Invalid secret"
 
-    data = {
-        "version": "2.0",
-        "secret": "secret",
-        "type": "InvalidType"
-    }
+    data = {"version": "2.0", "secret": "secret", "type": "InvalidType"}
     req = yield from meraki_client.post(URL, data=json.dumps(data))
     text = yield from req.json()
     assert req.status == 422
-    assert text['message'] == 'Invalid device type'
+    assert text["message"] == "Invalid device type"
 
     data = {
         "version": "2.0",
         "secret": "secret",
         "type": "BluetoothDevicesSeen",
-        "data": {
-            "observations": []
-        }
+        "data": {"observations": []},
     }
     req = yield from meraki_client.post(URL, data=json.dumps(data))
     assert req.status == 200
@@ -102,13 +94,13 @@ def test_data_will_be_saved(mock_device_tracker_conf, hass, meraki_client):
                         "unc": "46.3610585",
                     },
                     "seenTime": "2016-09-12T16:23:13Z",
-                    "ssid": 'ssid',
-                    "os": 'HA',
-                    "ipv6": '2607:f0d0:1002:51::4/64',
+                    "ssid": "ssid",
+                    "os": "HA",
+                    "ipv6": "2607:f0d0:1002:51::4/64",
                     "clientMac": "00:26:ab:b8:a9:a4",
                     "seenEpoch": "147369739",
                     "rssi": "20",
-                    "manufacturer": "Seiko Epson"
+                    "manufacturer": "Seiko Epson",
                 },
                 {
                     "location": {
@@ -117,24 +109,26 @@ def test_data_will_be_saved(mock_device_tracker_conf, hass, meraki_client):
                         "unc": "46.3610585",
                     },
                     "seenTime": "2016-09-12T16:21:13Z",
-                    "ssid": 'ssid',
-                    "os": 'HA',
-                    "ipv4": '192.168.0.1',
+                    "ssid": "ssid",
+                    "os": "HA",
+                    "ipv4": "192.168.0.1",
                     "clientMac": "00:26:ab:b8:a9:a5",
                     "seenEpoch": "147369750",
                     "rssi": "20",
-                    "manufacturer": "Seiko Epson"
-                }
+                    "manufacturer": "Seiko Epson",
+                },
             ]
-        }
+        },
     }
     req = yield from meraki_client.post(URL, data=json.dumps(data))
     assert req.status == 200
     yield from hass.async_block_till_done()
-    state_name = hass.states.get('{}.{}'.format('device_tracker',
-                                                '0026abb8a9a4')).state
-    assert 'home' == state_name
+    state_name = hass.states.get(
+        "{}.{}".format("device_tracker", "00_26_ab_b8_a9_a4")
+    ).state
+    assert "home" == state_name
 
-    state_name = hass.states.get('{}.{}'.format('device_tracker',
-                                                '0026abb8a9a5')).state
-    assert 'home' == state_name
+    state_name = hass.states.get(
+        "{}.{}".format("device_tracker", "00_26_ab_b8_a9_a5")
+    ).state
+    assert "home" == state_name
diff --git a/tests/components/device_tracker/test_owntracks.py b/tests/components/device_tracker/test_owntracks.py
index 68c1f1e8766..79d0bdb6f73 100644
--- a/tests/components/device_tracker/test_owntracks.py
+++ b/tests/components/device_tracker/test_owntracks.py
@@ -252,10 +252,10 @@ WAYPOINT_MESSAGE = {
 }
 
 WAYPOINT_ENTITY_NAMES = [
-    'zone.greg_phone__exp_wayp1',
-    'zone.greg_phone__exp_wayp2',
-    'zone.ram_phone__exp_wayp1',
-    'zone.ram_phone__exp_wayp2',
+    'zone.greg_phone_exp_wayp1',
+    'zone.greg_phone_exp_wayp2',
+    'zone.ram_phone_exp_wayp1',
+    'zone.ram_phone_exp_wayp2',
 ]
 
 LWT_MESSAGE = {
@@ -407,7 +407,7 @@ def assert_mobile_tracker_accuracy(hass, accuracy, beacon=IBEACON_DEVICE):
 async def test_location_invalid_devid(hass, context):
     """Test the update of a location."""
     await send_message(hass, 'owntracks/paulus/nexus-5x', LOCATION_MESSAGE)
-    state = hass.states.get('device_tracker.paulus_nexus5x')
+    state = hass.states.get('device_tracker.paulus_nexus_5x')
     assert state.state == 'outer'
 
 
diff --git a/tests/components/esphome/__init__.py b/tests/components/esphome/__init__.py
new file mode 100644
index 00000000000..a3e4985a2d8
--- /dev/null
+++ b/tests/components/esphome/__init__.py
@@ -0,0 +1 @@
+"""Tests for esphome."""
diff --git a/tests/components/esphome/test_config_flow.py b/tests/components/esphome/test_config_flow.py
new file mode 100644
index 00000000000..1291aa53123
--- /dev/null
+++ b/tests/components/esphome/test_config_flow.py
@@ -0,0 +1,249 @@
+"""Test config flow."""
+from collections import namedtuple
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from homeassistant.components.esphome import config_flow
+from tests.common import mock_coro, MockConfigEntry
+
+MockDeviceInfo = namedtuple("DeviceInfo", ["uses_password", "name"])
+
+
+@pytest.fixture(autouse=True)
+def aioesphomeapi_mock():
+    """Mock aioesphomeapi."""
+    with patch.dict('sys.modules', {
+        'aioesphomeapi': MagicMock(),
+    }):
+        yield
+
+
+@pytest.fixture
+def mock_client():
+    """Mock APIClient."""
+    with patch('aioesphomeapi.APIClient') as mock_client:
+        def mock_constructor(loop, host, port, password):
+            """Fake the client constructor."""
+            mock_client.host = host
+            mock_client.port = port
+            mock_client.password = password
+            return mock_client
+
+        mock_client.side_effect = mock_constructor
+        mock_client.connect.return_value = mock_coro()
+        mock_client.disconnect.return_value = mock_coro()
+
+        yield mock_client
+
+
+@pytest.fixture(autouse=True)
+def mock_api_connection_error():
+    """Mock out the try login method."""
+    with patch('aioesphomeapi.APIConnectionError',
+               new_callable=lambda: OSError) as mock_error:
+        yield mock_error
+
+
+async def test_user_connection_works(hass, mock_client):
+    """Test we can finish a config flow."""
+    flow = config_flow.EsphomeFlowHandler()
+    flow.hass = hass
+    result = await flow.async_step_user(user_input=None)
+    assert result['type'] == 'form'
+
+    mock_client.device_info.return_value = mock_coro(
+        MockDeviceInfo(False, "test"))
+
+    result = await flow.async_step_user(user_input={
+        'host': '127.0.0.1',
+        'port': 80,
+    })
+
+    assert result['type'] == 'create_entry'
+    assert result['data'] == {
+        'host': '127.0.0.1',
+        'port': 80,
+        'password': ''
+    }
+    assert result['title'] == 'test'
+    assert len(mock_client.connect.mock_calls) == 1
+    assert len(mock_client.device_info.mock_calls) == 1
+    assert len(mock_client.disconnect.mock_calls) == 1
+    assert mock_client.host == '127.0.0.1'
+    assert mock_client.port == 80
+    assert mock_client.password == ''
+
+
+async def test_user_resolve_error(hass, mock_api_connection_error,
+                                  mock_client):
+    """Test user step with IP resolve error."""
+    flow = config_flow.EsphomeFlowHandler()
+    flow.hass = hass
+    await flow.async_step_user(user_input=None)
+
+    class MockResolveError(mock_api_connection_error):
+        """Create an exception with a specific error message."""
+
+        def __init__(self):
+            """Initialize."""
+            super().__init__("Error resolving IP address")
+
+    with patch('aioesphomeapi.APIConnectionError',
+               new_callable=lambda: MockResolveError,
+               ) as exc:
+        mock_client.device_info.side_effect = exc
+        result = await flow.async_step_user(user_input={
+            'host': '127.0.0.1',
+            'port': 6053,
+        })
+
+    assert result['type'] == 'form'
+    assert result['step_id'] == 'user'
+    assert result['errors'] == {
+        'base': 'resolve_error'
+    }
+    assert len(mock_client.connect.mock_calls) == 1
+    assert len(mock_client.device_info.mock_calls) == 1
+    assert len(mock_client.disconnect.mock_calls) == 1
+
+
+async def test_user_connection_error(hass, mock_api_connection_error,
+                                     mock_client):
+    """Test user step with connection error."""
+    flow = config_flow.EsphomeFlowHandler()
+    flow.hass = hass
+    await flow.async_step_user(user_input=None)
+
+    mock_client.device_info.side_effect = mock_api_connection_error
+
+    result = await flow.async_step_user(user_input={
+        'host': '127.0.0.1',
+        'port': 6053,
+    })
+
+    assert result['type'] == 'form'
+    assert result['step_id'] == 'user'
+    assert result['errors'] == {
+        'base': 'connection_error'
+    }
+    assert len(mock_client.connect.mock_calls) == 1
+    assert len(mock_client.device_info.mock_calls) == 1
+    assert len(mock_client.disconnect.mock_calls) == 1
+
+
+async def test_user_with_password(hass, mock_client):
+    """Test user step with password."""
+    flow = config_flow.EsphomeFlowHandler()
+    flow.hass = hass
+    await flow.async_step_user(user_input=None)
+
+    mock_client.device_info.return_value = mock_coro(
+        MockDeviceInfo(True, "test"))
+
+    result = await flow.async_step_user(user_input={
+        'host': '127.0.0.1',
+        'port': 6053,
+    })
+
+    assert result['type'] == 'form'
+    assert result['step_id'] == 'authenticate'
+
+    result = await flow.async_step_authenticate(user_input={
+        'password': 'password1'
+    })
+
+    assert result['type'] == 'create_entry'
+    assert result['data'] == {
+        'host': '127.0.0.1',
+        'port': 6053,
+        'password': 'password1'
+    }
+    assert mock_client.password == 'password1'
+
+
+async def test_user_invalid_password(hass, mock_api_connection_error,
+                                     mock_client):
+    """Test user step with invalid password."""
+    flow = config_flow.EsphomeFlowHandler()
+    flow.hass = hass
+    await flow.async_step_user(user_input=None)
+
+    mock_client.device_info.return_value = mock_coro(
+        MockDeviceInfo(True, "test"))
+
+    await flow.async_step_user(user_input={
+        'host': '127.0.0.1',
+        'port': 6053,
+    })
+    mock_client.connect.side_effect = mock_api_connection_error
+    result = await flow.async_step_authenticate(user_input={
+        'password': 'invalid'
+    })
+
+    assert result['type'] == 'form'
+    assert result['step_id'] == 'authenticate'
+    assert result['errors'] == {
+        'base': 'invalid_password'
+    }
+
+
+async def test_discovery_initiation(hass, mock_client):
+    """Test discovery importing works."""
+    flow = config_flow.EsphomeFlowHandler()
+    flow.hass = hass
+    service_info = {
+        'host': '192.168.43.183',
+        'port': 6053,
+        'hostname': 'test8266.local.',
+        'properties': {}
+    }
+
+    mock_client.device_info.return_value = mock_coro(
+        MockDeviceInfo(False, "test8266"))
+
+    result = await flow.async_step_discovery(user_input=service_info)
+    assert result['type'] == 'create_entry'
+    assert result['title'] == 'test8266'
+    assert result['data']['host'] == 'test8266.local'
+    assert result['data']['port'] == 6053
+
+
+async def test_discovery_already_configured_hostname(hass, mock_client):
+    """Test discovery aborts if already configured via hostname."""
+    MockConfigEntry(
+        domain='esphome',
+        data={'host': 'test8266.local', 'port': 6053, 'password': ''}
+    ).add_to_hass(hass)
+
+    flow = config_flow.EsphomeFlowHandler()
+    flow.hass = hass
+    service_info = {
+        'host': '192.168.43.183',
+        'port': 6053,
+        'hostname': 'test8266.local.',
+        'properties': {}
+    }
+    result = await flow.async_step_discovery(user_input=service_info)
+    assert result['type'] == 'abort'
+    assert result['reason'] == 'already_configured'
+
+
+async def test_discovery_already_configured_ip(hass, mock_client):
+    """Test discovery aborts if already configured via static IP."""
+    MockConfigEntry(
+        domain='esphome',
+        data={'host': '192.168.43.183', 'port': 6053, 'password': ''}
+    ).add_to_hass(hass)
+
+    flow = config_flow.EsphomeFlowHandler()
+    flow.hass = hass
+    service_info = {
+        'host': '192.168.43.183',
+        'port': 6053,
+        'hostname': 'test8266.local.',
+        'properties': {}
+    }
+    result = await flow.async_step_discovery(user_input=service_info)
+    assert result['type'] == 'abort'
+    assert result['reason'] == 'already_configured'
diff --git a/tests/components/fan/test_mqtt.py b/tests/components/fan/test_mqtt.py
index a3e8b0e9f32..405c20196a0 100644
--- a/tests/components/fan/test_mqtt.py
+++ b/tests/components/fan/test_mqtt.py
@@ -1,5 +1,6 @@
 """Test MQTT fans."""
 import json
+from unittest.mock import ANY
 
 from homeassistant.setup import async_setup_component
 from homeassistant.components import fan
@@ -7,7 +8,7 @@ from homeassistant.components.mqtt.discovery import async_start
 from homeassistant.const import ATTR_ASSUMED_STATE, STATE_UNAVAILABLE
 
 from tests.common import async_fire_mqtt_message, MockConfigEntry, \
-    async_mock_mqtt_component
+    async_mock_mqtt_component, mock_registry
 
 
 async def test_fail_setup_if_no_command_topic(hass, mqtt_mock):
@@ -224,3 +225,39 @@ async def test_entity_device_info_with_identifier(hass, mqtt_mock):
     assert device.name == 'Beer'
     assert device.model == 'Glass'
     assert device.sw_version == '0.1-beta'
+
+
+async def test_entity_id_update(hass, mqtt_mock):
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    registry = mock_registry(hass, {})
+    mock_mqtt = await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, fan.DOMAIN, {
+        fan.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'beer',
+            'state_topic': 'test-topic',
+            'command_topic': 'command-topic',
+            'availability_topic': 'avty-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+
+    state = hass.states.get('fan.beer')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.reset_mock()
+
+    registry.async_update_entity('fan.beer', new_entity_id='fan.milk')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    state = hass.states.get('fan.beer')
+    assert state is None
+
+    state = hass.states.get('fan.milk')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
diff --git a/tests/components/homematicip_cloud/test_hap.py b/tests/components/homematicip_cloud/test_hap.py
index 476bed368d7..92f58b37662 100644
--- a/tests/components/homematicip_cloud/test_hap.py
+++ b/tests/components/homematicip_cloud/test_hap.py
@@ -3,7 +3,7 @@ from unittest.mock import Mock, patch
 
 from homeassistant.components.homematicip_cloud import hap as hmipc
 from homeassistant.components.homematicip_cloud import const, errors
-from tests.common import mock_coro
+from tests.common import mock_coro, mock_coro_func
 
 
 async def test_auth_setup(hass):
@@ -95,6 +95,7 @@ async def test_hap_reset_unloads_entry_if_setup():
     hass = Mock()
     entry = Mock()
     home = Mock()
+    home.disable_events = mock_coro_func()
     entry.data = {
         hmipc.HMIPC_HAPID: 'ABC123',
         hmipc.HMIPC_AUTHTOKEN: '123',
diff --git a/tests/components/light/test_init.py b/tests/components/light/test_init.py
index 09474a5ad06..28d688b2080 100644
--- a/tests/components/light/test_init.py
+++ b/tests/components/light/test_init.py
@@ -5,7 +5,10 @@ import unittest.mock as mock
 import os
 from io import StringIO
 
+import pytest
+
 from homeassistant import core, loader
+from homeassistant.exceptions import Unauthorized
 from homeassistant.setup import setup_component, async_setup_component
 from homeassistant.const import (
     ATTR_ENTITY_ID, STATE_ON, STATE_OFF, CONF_PLATFORM,
@@ -495,3 +498,22 @@ async def test_light_context(hass, hass_admin_user):
     assert state2 is not None
     assert state.state != state2.state
     assert state2.context.user_id == hass_admin_user.id
+
+
+async def test_light_turn_on_auth(hass, hass_admin_user):
+    """Test that light context works."""
+    assert await async_setup_component(hass, 'light', {
+        'light': {
+            'platform': 'test'
+        }
+    })
+
+    state = hass.states.get('light.ceiling')
+    assert state is not None
+
+    hass_admin_user.mock_policy({})
+
+    with pytest.raises(Unauthorized):
+        await hass.services.async_call('light', 'turn_on', {
+            'entity_id': state.entity_id,
+        }, True, core.Context(user_id=hass_admin_user.id))
diff --git a/tests/components/light/test_mqtt.py b/tests/components/light/test_mqtt.py
index 9e4fa3ebc79..951a9f04be9 100644
--- a/tests/components/light/test_mqtt.py
+++ b/tests/components/light/test_mqtt.py
@@ -153,8 +153,9 @@ light:
   payload_off: "off"
 
 """
+import json
 from unittest import mock
-from unittest.mock import patch
+from unittest.mock import ANY, patch
 
 from homeassistant.setup import async_setup_component
 from homeassistant.const import (
@@ -164,8 +165,8 @@ from homeassistant.components.mqtt.discovery import async_start
 import homeassistant.core as ha
 
 from tests.common import (
-    assert_setup_component, async_fire_mqtt_message,
-    mock_coro, MockConfigEntry)
+    assert_setup_component, async_fire_mqtt_message, async_mock_mqtt_component,
+    mock_coro, MockConfigEntry, mock_registry)
 from tests.components.light import common
 
 
@@ -677,6 +678,37 @@ async def test_sending_mqtt_rgb_command_with_template(hass, mqtt_mock):
     assert (255, 128, 63) == state.attributes['rgb_color']
 
 
+async def test_sending_mqtt_color_temp_command_with_template(hass, mqtt_mock):
+    """Test the sending of Color Temp command with template."""
+    config = {light.DOMAIN: {
+        'platform': 'mqtt',
+        'name': 'test',
+        'command_topic': 'test_light_color_temp/set',
+        'color_temp_command_topic': 'test_light_color_temp/color_temp/set',
+        'color_temp_command_template': '{{ (1000 / value) | round(0) }}',
+        'payload_on': 'on',
+        'payload_off': 'off',
+        'qos': 0
+    }}
+
+    assert await async_setup_component(hass, light.DOMAIN, config)
+
+    state = hass.states.get('light.test')
+    assert STATE_OFF == state.state
+
+    common.async_turn_on(hass, 'light.test', color_temp=100)
+    await hass.async_block_till_done()
+
+    mqtt_mock.async_publish.assert_has_calls([
+        mock.call('test_light_color_temp/set', 'on', 0, False),
+        mock.call('test_light_color_temp/color_temp/set', '10', 0, False),
+    ], any_order=True)
+
+    state = hass.states.get('light.test')
+    assert STATE_ON == state.state
+    assert 100 == state.attributes['color_temp']
+
+
 async def test_show_brightness_if_only_command_topic(hass, mqtt_mock):
     """Test the brightness if only a command topic is present."""
     config = {light.DOMAIN: {
@@ -1038,6 +1070,29 @@ async def test_custom_availability_payload(hass, mqtt_mock):
     assert STATE_UNAVAILABLE == state.state
 
 
+async def test_unique_id(hass):
+    """Test unique id option only creates one light per unique_id."""
+    await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, light.DOMAIN, {
+        light.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'Test 1',
+            'status_topic': 'test-topic',
+            'command_topic': 'test_topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }, {
+            'platform': 'mqtt',
+            'name': 'Test 2',
+            'status_topic': 'test-topic',
+            'command_topic': 'test_topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+    async_fire_mqtt_message(hass, 'test-topic', 'payload')
+    await hass.async_block_till_done()
+    assert len(hass.states.async_entity_ids(light.DOMAIN)) == 1
+
+
 async def test_discovery_removal_light(hass, mqtt_mock, caplog):
     """Test removal of discovered light."""
     entry = MockConfigEntry(domain=mqtt.DOMAIN)
@@ -1117,3 +1172,78 @@ async def test_discovery_update_light(hass, mqtt_mock, caplog):
     assert state.name == 'Milk'
     state = hass.states.get('light.milk')
     assert state is None
+
+
+async def test_entity_device_info_with_identifier(hass, mqtt_mock):
+    """Test MQTT light device registry integration."""
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+    entry.add_to_hass(hass)
+    await async_start(hass, 'homeassistant', {}, entry)
+    registry = await hass.helpers.device_registry.async_get_registry()
+
+    data = json.dumps({
+        'platform': 'mqtt',
+        'name': 'Test 1',
+        'state_topic': 'test-topic',
+        'command_topic': 'test-topic',
+        'device': {
+            'identifiers': ['helloworld'],
+            'connections': [
+                ["mac", "02:5b:26:a8:dc:12"],
+            ],
+            'manufacturer': 'Whatever',
+            'name': 'Beer',
+            'model': 'Glass',
+            'sw_version': '0.1-beta',
+        },
+        'unique_id': 'veryunique'
+    })
+    async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
+                            data)
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    device = registry.async_get_device({('mqtt', 'helloworld')}, set())
+    assert device is not None
+    assert device.identifiers == {('mqtt', 'helloworld')}
+    assert device.connections == {('mac', "02:5b:26:a8:dc:12")}
+    assert device.manufacturer == 'Whatever'
+    assert device.name == 'Beer'
+    assert device.model == 'Glass'
+    assert device.sw_version == '0.1-beta'
+
+
+async def test_entity_id_update(hass, mqtt_mock):
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    registry = mock_registry(hass, {})
+    mock_mqtt = await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, light.DOMAIN, {
+        light.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'beer',
+            'state_topic': 'test-topic',
+            'command_topic': 'command-topic',
+            'availability_topic': 'avty-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+
+    state = hass.states.get('light.beer')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.reset_mock()
+
+    registry.async_update_entity('light.beer', new_entity_id='light.milk')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    state = hass.states.get('light.beer')
+    assert state is None
+
+    state = hass.states.get('light.milk')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
diff --git a/tests/components/light/test_mqtt_json.py b/tests/components/light/test_mqtt_json.py
index 8567dfd7921..691e34104e1 100644
--- a/tests/components/light/test_mqtt_json.py
+++ b/tests/components/light/test_mqtt_json.py
@@ -87,7 +87,8 @@ light:
   brightness: true
   brightness_scale: 99
 """
-from unittest.mock import patch
+import json
+from unittest.mock import ANY, patch
 
 from homeassistant.setup import async_setup_component
 from homeassistant.const import (
@@ -97,7 +98,9 @@ from homeassistant.components import light, mqtt
 from homeassistant.components.mqtt.discovery import async_start
 import homeassistant.core as ha
 
-from tests.common import mock_coro, async_fire_mqtt_message, MockConfigEntry
+from tests.common import (
+    mock_coro, async_fire_mqtt_message, async_mock_mqtt_component,
+    MockConfigEntry, mock_registry)
 
 
 async def test_fail_setup_if_no_command_topic(hass, mqtt_mock):
@@ -533,6 +536,31 @@ async def test_custom_availability_payload(hass, mqtt_mock):
     assert STATE_UNAVAILABLE == state.state
 
 
+async def test_unique_id(hass):
+    """Test unique id option only creates one light per unique_id."""
+    await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, light.DOMAIN, {
+        light.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'Test 1',
+            'schema': 'json',
+            'status_topic': 'test-topic',
+            'command_topic': 'test_topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }, {
+            'platform': 'mqtt',
+            'name': 'Test 2',
+            'schema': 'json',
+            'status_topic': 'test-topic',
+            'command_topic': 'test_topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+    async_fire_mqtt_message(hass, 'test-topic', 'payload')
+    await hass.async_block_till_done()
+    assert len(hass.states.async_entity_ids(light.DOMAIN)) == 1
+
+
 async def test_discovery_removal(hass, mqtt_mock, caplog):
     """Test removal of discovered mqtt_json lights."""
     entry = MockConfigEntry(domain=mqtt.DOMAIN)
@@ -609,3 +637,80 @@ async def test_discovery_update_light(hass, mqtt_mock, caplog):
     assert state.name == 'Milk'
     state = hass.states.get('light.milk')
     assert state is None
+
+
+async def test_entity_device_info_with_identifier(hass, mqtt_mock):
+    """Test MQTT light device registry integration."""
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+    entry.add_to_hass(hass)
+    await async_start(hass, 'homeassistant', {}, entry)
+    registry = await hass.helpers.device_registry.async_get_registry()
+
+    data = json.dumps({
+        'platform': 'mqtt',
+        'name': 'Test 1',
+        'schema': 'json',
+        'state_topic': 'test-topic',
+        'command_topic': 'test-topic',
+        'device': {
+            'identifiers': ['helloworld'],
+            'connections': [
+                ["mac", "02:5b:26:a8:dc:12"],
+            ],
+            'manufacturer': 'Whatever',
+            'name': 'Beer',
+            'model': 'Glass',
+            'sw_version': '0.1-beta',
+        },
+        'unique_id': 'veryunique'
+    })
+    async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
+                            data)
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    device = registry.async_get_device({('mqtt', 'helloworld')}, set())
+    assert device is not None
+    assert device.identifiers == {('mqtt', 'helloworld')}
+    assert device.connections == {('mac', "02:5b:26:a8:dc:12")}
+    assert device.manufacturer == 'Whatever'
+    assert device.name == 'Beer'
+    assert device.model == 'Glass'
+    assert device.sw_version == '0.1-beta'
+
+
+async def test_entity_id_update(hass, mqtt_mock):
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    registry = mock_registry(hass, {})
+    mock_mqtt = await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, light.DOMAIN, {
+        light.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'beer',
+            'schema': 'json',
+            'state_topic': 'test-topic',
+            'command_topic': 'command-topic',
+            'availability_topic': 'avty-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+
+    state = hass.states.get('light.beer')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.reset_mock()
+
+    registry.async_update_entity('light.beer', new_entity_id='light.milk')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    state = hass.states.get('light.beer')
+    assert state is None
+
+    state = hass.states.get('light.milk')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
diff --git a/tests/components/light/test_mqtt_template.py b/tests/components/light/test_mqtt_template.py
index ce4a5f5a2e6..f9946fc5b88 100644
--- a/tests/components/light/test_mqtt_template.py
+++ b/tests/components/light/test_mqtt_template.py
@@ -26,7 +26,8 @@ If your light doesn't support white value feature, omit `white_value_template`.
 
 If your light doesn't support RGB feature, omit `(red|green|blue)_template`.
 """
-from unittest.mock import patch
+import json
+from unittest.mock import ANY, patch
 
 from homeassistant.setup import async_setup_component
 from homeassistant.const import (
@@ -37,7 +38,7 @@ import homeassistant.core as ha
 
 from tests.common import (
     async_fire_mqtt_message, assert_setup_component, mock_coro,
-    MockConfigEntry)
+    async_mock_mqtt_component, MockConfigEntry, mock_registry)
 
 
 async def test_setup_fails(hass, mqtt_mock):
@@ -484,6 +485,33 @@ async def test_custom_availability_payload(hass, mqtt_mock):
     assert STATE_UNAVAILABLE == state.state
 
 
+async def test_unique_id(hass):
+    """Test unique id option only creates one light per unique_id."""
+    await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, light.DOMAIN, {
+        light.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'Test 1',
+            'schema': 'template',
+            'status_topic': 'test-topic',
+            'command_topic': 'test_topic',
+            'command_on_template': 'on,{{ transition }}',
+            'command_off_template': 'off,{{ transition|d }}',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }, {
+            'platform': 'mqtt',
+            'name': 'Test 2',
+            'schema': 'template',
+            'status_topic': 'test-topic',
+            'command_topic': 'test_topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+    async_fire_mqtt_message(hass, 'test-topic', 'payload')
+    await hass.async_block_till_done()
+    assert len(hass.states.async_entity_ids(light.DOMAIN)) == 1
+
+
 async def test_discovery(hass, mqtt_mock, caplog):
     """Test removal of discovered mqtt_json lights."""
     entry = MockConfigEntry(domain=mqtt.DOMAIN)
@@ -562,3 +590,84 @@ async def test_discovery_update_light(hass, mqtt_mock, caplog):
     assert state.name == 'Milk'
     state = hass.states.get('light.milk')
     assert state is None
+
+
+async def test_entity_device_info_with_identifier(hass, mqtt_mock):
+    """Test MQTT light device registry integration."""
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+    entry.add_to_hass(hass)
+    await async_start(hass, 'homeassistant', {}, entry)
+    registry = await hass.helpers.device_registry.async_get_registry()
+
+    data = json.dumps({
+        'platform': 'mqtt',
+        'name': 'Test 1',
+        'schema': 'template',
+        'state_topic': 'test-topic',
+        'command_topic': 'test-topic',
+        'command_on_template': 'on,{{ transition }}',
+        'command_off_template': 'off,{{ transition|d }}',
+        'device': {
+            'identifiers': ['helloworld'],
+            'connections': [
+                ["mac", "02:5b:26:a8:dc:12"],
+            ],
+            'manufacturer': 'Whatever',
+            'name': 'Beer',
+            'model': 'Glass',
+            'sw_version': '0.1-beta',
+        },
+        'unique_id': 'veryunique'
+    })
+    async_fire_mqtt_message(hass, 'homeassistant/light/bla/config',
+                            data)
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    device = registry.async_get_device({('mqtt', 'helloworld')}, set())
+    assert device is not None
+    assert device.identifiers == {('mqtt', 'helloworld')}
+    assert device.connections == {('mac', "02:5b:26:a8:dc:12")}
+    assert device.manufacturer == 'Whatever'
+    assert device.name == 'Beer'
+    assert device.model == 'Glass'
+    assert device.sw_version == '0.1-beta'
+
+
+async def test_entity_id_update(hass, mqtt_mock):
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    registry = mock_registry(hass, {})
+    mock_mqtt = await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, light.DOMAIN, {
+        light.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'beer',
+            'schema': 'template',
+            'state_topic': 'test-topic',
+            'command_topic': 'command-topic',
+            'command_on_template': 'on,{{ transition }}',
+            'command_off_template': 'off,{{ transition|d }}',
+            'availability_topic': 'avty-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+
+    state = hass.states.get('light.beer')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.reset_mock()
+
+    registry.async_update_entity('light.beer', new_entity_id='light.milk')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    state = hass.states.get('light.beer')
+    assert state is None
+
+    state = hass.states.get('light.milk')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
diff --git a/tests/components/light/test_rflink.py b/tests/components/light/test_rflink.py
index c55c16077e0..17898bd2451 100644
--- a/tests/components/light/test_rflink.py
+++ b/tests/components/light/test_rflink.py
@@ -1,18 +1,17 @@
-"""Test for RFlink light components.
+"""Test for RFLink light components.
 
-Test setup of rflink lights component/platform. State tracking and
-control of Rflink switch devices.
+Test setup of RFLink lights component/platform. State tracking and
+control of RFLink switch devices.
 
 """
 
-import asyncio
-
 from homeassistant.components.light import ATTR_BRIGHTNESS
 from homeassistant.components.rflink import EVENT_BUTTON_PRESSED
 from homeassistant.const import (
-    ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON)
-from homeassistant.core import callback
+    ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON, STATE_ON, STATE_OFF)
+from homeassistant.core import callback, State, CoreState
 
+from tests.common import mock_restore_cache
 from ..test_rflink import mock_rflink
 
 DOMAIN = 'light'
@@ -42,11 +41,10 @@ CONFIG = {
 }
 
 
-@asyncio.coroutine
-def test_default_setup(hass, monkeypatch):
-    """Test all basic functionality of the rflink switch component."""
+async def test_default_setup(hass, monkeypatch):
+    """Test all basic functionality of the RFLink switch component."""
     # setup mocking rflink module
-    event_callback, create, protocol, _ = yield from mock_rflink(
+    event_callback, create, protocol, _ = await mock_rflink(
         hass, CONFIG, DOMAIN, monkeypatch)
 
     # make sure arguments are passed
@@ -65,7 +63,7 @@ def test_default_setup(hass, monkeypatch):
         'id': 'protocol_0_0',
         'command': 'on',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     light_after_first_command = hass.states.get(DOMAIN + '.test')
     assert light_after_first_command.state == 'on'
@@ -77,26 +75,26 @@ def test_default_setup(hass, monkeypatch):
         'id': 'protocol_0_0',
         'command': 'off',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert hass.states.get(DOMAIN + '.test').state == 'off'
 
-    # should repond to group command
+    # should respond to group command
     event_callback({
         'id': 'protocol_0_0',
         'command': 'allon',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     light_after_first_command = hass.states.get(DOMAIN + '.test')
     assert light_after_first_command.state == 'on'
 
-    # should repond to group command
+    # should respond to group command
     event_callback({
         'id': 'protocol_0_0',
         'command': 'alloff',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert hass.states.get(DOMAIN + '.test').state == 'off'
 
@@ -106,7 +104,7 @@ def test_default_setup(hass, monkeypatch):
         'id': 'test_alias_0_0',
         'command': 'on',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert hass.states.get(DOMAIN + '.test').state == 'on'
 
@@ -115,23 +113,23 @@ def test_default_setup(hass, monkeypatch):
         'id': 'protocol2_0_1',
         'command': 'on',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert hass.states.get(DOMAIN + '.protocol2_0_1').state == 'on'
 
-    # test changing state from HA propagates to Rflink
-    hass.async_add_job(
+    # test changing state from HA propagates to RFLink
+    hass.async_create_task(
         hass.services.async_call(DOMAIN, SERVICE_TURN_OFF,
                                  {ATTR_ENTITY_ID: DOMAIN + '.test'}))
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
     assert hass.states.get(DOMAIN + '.test').state == 'off'
     assert protocol.send_command_ack.call_args_list[0][0][0] == 'protocol_0_0'
     assert protocol.send_command_ack.call_args_list[0][0][1] == 'off'
 
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(DOMAIN, SERVICE_TURN_ON,
                                  {ATTR_ENTITY_ID: DOMAIN + '.test'}))
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
     assert hass.states.get(DOMAIN + '.test').state == 'on'
     assert protocol.send_command_ack.call_args_list[1][0][1] == 'on'
 
@@ -140,11 +138,11 @@ def test_default_setup(hass, monkeypatch):
         'id': 'newkaku_0_1',
         'command': 'off',
     })
-    yield from hass.async_block_till_done()
-    hass.async_add_job(
+    await hass.async_block_till_done()
+    hass.async_create_task(
         hass.services.async_call(DOMAIN, SERVICE_TURN_ON,
                                  {ATTR_ENTITY_ID: DOMAIN + '.newkaku_0_1'}))
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     # dimmable should send highest dim level when turning on
     assert protocol.send_command_ack.call_args_list[2][0][1] == '15'
@@ -152,30 +150,29 @@ def test_default_setup(hass, monkeypatch):
     # and send on command for fallback
     assert protocol.send_command_ack.call_args_list[3][0][1] == 'on'
 
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(DOMAIN, SERVICE_TURN_ON,
                                  {
                                      ATTR_ENTITY_ID: DOMAIN + '.newkaku_0_1',
                                      ATTR_BRIGHTNESS: 128,
                                  }))
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert protocol.send_command_ack.call_args_list[4][0][1] == '7'
 
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(DOMAIN, SERVICE_TURN_ON,
                                  {
                                      ATTR_ENTITY_ID: DOMAIN + '.dim_test',
                                      ATTR_BRIGHTNESS: 128,
                                  }))
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert protocol.send_command_ack.call_args_list[5][0][1] == '7'
 
 
-@asyncio.coroutine
-def test_firing_bus_event(hass, monkeypatch):
-    """Incoming Rflink command events should be put on the HA event bus."""
+async def test_firing_bus_event(hass, monkeypatch):
+    """Incoming RFLink command events should be put on the HA event bus."""
     config = {
         'rflink': {
             'port': '/dev/ttyABC0',
@@ -193,7 +190,7 @@ def test_firing_bus_event(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    event_callback, _, _, _ = yield from mock_rflink(
+    event_callback, _, _, _ = await mock_rflink(
         hass, config, DOMAIN, monkeypatch)
 
     calls = []
@@ -208,13 +205,12 @@ def test_firing_bus_event(hass, monkeypatch):
         'id': 'protocol_0_0',
         'command': 'off',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert calls[0].data == {'state': 'off', 'entity_id': DOMAIN + '.test'}
 
 
-@asyncio.coroutine
-def test_signal_repetitions(hass, monkeypatch):
+async def test_signal_repetitions(hass, monkeypatch):
     """Command should be sent amount of configured repetitions."""
     config = {
         'rflink': {
@@ -241,26 +237,26 @@ def test_signal_repetitions(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    event_callback, _, protocol, _ = yield from mock_rflink(
+    event_callback, _, protocol, _ = await mock_rflink(
         hass, config, DOMAIN, monkeypatch)
 
     # test if signal repetition is performed according to configuration
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(DOMAIN, SERVICE_TURN_OFF,
                                  {ATTR_ENTITY_ID: DOMAIN + '.test'}))
 
     # wait for commands and repetitions to finish
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert protocol.send_command_ack.call_count == 2
 
     # test if default apply to configured devices
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(DOMAIN, SERVICE_TURN_OFF,
                                  {ATTR_ENTITY_ID: DOMAIN + '.test1'}))
 
     # wait for commands and repetitions to finish
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert protocol.send_command_ack.call_count == 5
 
@@ -271,20 +267,19 @@ def test_signal_repetitions(hass, monkeypatch):
     })
 
     # make sure entity is created before setting state
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(DOMAIN, SERVICE_TURN_OFF,
                                  {ATTR_ENTITY_ID: DOMAIN + '.protocol_0_2'}))
 
     # wait for commands and repetitions to finish
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert protocol.send_command_ack.call_count == 8
 
 
-@asyncio.coroutine
-def test_signal_repetitions_alternation(hass, monkeypatch):
+async def test_signal_repetitions_alternation(hass, monkeypatch):
     """Simultaneously switching entities must alternate repetitions."""
     config = {
         'rflink': {
@@ -306,17 +301,17 @@ def test_signal_repetitions_alternation(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    _, _, protocol, _ = yield from mock_rflink(
+    _, _, protocol, _ = await mock_rflink(
         hass, config, DOMAIN, monkeypatch)
 
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(DOMAIN, SERVICE_TURN_OFF,
                                  {ATTR_ENTITY_ID: DOMAIN + '.test'}))
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(DOMAIN, SERVICE_TURN_OFF,
                                  {ATTR_ENTITY_ID: DOMAIN + '.test1'}))
 
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert protocol.send_command_ack.call_args_list[0][0][0] == 'protocol_0_0'
     assert protocol.send_command_ack.call_args_list[1][0][0] == 'protocol_0_1'
@@ -324,8 +319,7 @@ def test_signal_repetitions_alternation(hass, monkeypatch):
     assert protocol.send_command_ack.call_args_list[3][0][0] == 'protocol_0_1'
 
 
-@asyncio.coroutine
-def test_signal_repetitions_cancelling(hass, monkeypatch):
+async def test_signal_repetitions_cancelling(hass, monkeypatch):
     """Cancel outstanding repetitions when state changed."""
     config = {
         'rflink': {
@@ -343,18 +337,18 @@ def test_signal_repetitions_cancelling(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    _, _, protocol, _ = yield from mock_rflink(
+    _, _, protocol, _ = await mock_rflink(
         hass, config, DOMAIN, monkeypatch)
 
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(DOMAIN, SERVICE_TURN_OFF,
                                  {ATTR_ENTITY_ID: DOMAIN + '.test'}))
 
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(DOMAIN, SERVICE_TURN_ON,
                                  {ATTR_ENTITY_ID: DOMAIN + '.test'}))
 
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert protocol.send_command_ack.call_args_list[0][0][1] == 'on'
     assert protocol.send_command_ack.call_args_list[1][0][1] == 'off'
@@ -362,8 +356,7 @@ def test_signal_repetitions_cancelling(hass, monkeypatch):
     assert protocol.send_command_ack.call_args_list[3][0][1] == 'off'
 
 
-@asyncio.coroutine
-def test_type_toggle(hass, monkeypatch):
+async def test_type_toggle(hass, monkeypatch):
     """Test toggle type lights (on/on)."""
     config = {
         'rflink': {
@@ -381,32 +374,48 @@ def test_type_toggle(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    event_callback, _, _, _ = yield from mock_rflink(
+    event_callback, _, _, _ = await mock_rflink(
         hass, config, DOMAIN, monkeypatch)
 
+    # default value = 'off'
     assert hass.states.get(DOMAIN + '.toggle_test').state == 'off'
 
-    # test sending on command to toggle alias
+    # test sending 'on' command, must set state = 'on'
     event_callback({
         'id': 'toggle_0_0',
         'command': 'on',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert hass.states.get(DOMAIN + '.toggle_test').state == 'on'
 
-    # test sending group command to group alias
+    # test sending 'on' command again, must set state = 'off'
     event_callback({
         'id': 'toggle_0_0',
         'command': 'on',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    assert hass.states.get(DOMAIN + '.toggle_test').state == 'off'
+
+    # test async_turn_off, must set state = 'on' ('off' + toggle)
+    hass.async_create_task(
+        hass.services.async_call(DOMAIN, SERVICE_TURN_OFF,
+                                 {ATTR_ENTITY_ID: DOMAIN + '.toggle_test'}))
+    await hass.async_block_till_done()
+
+    assert hass.states.get(DOMAIN + '.toggle_test').state == 'on'
+
+    # test async_turn_on, must set state = 'off' (yes, sounds crazy)
+    hass.async_create_task(
+        hass.services.async_call(DOMAIN, SERVICE_TURN_ON,
+                                 {ATTR_ENTITY_ID: DOMAIN + '.toggle_test'}))
+    await hass.async_block_till_done()
 
     assert hass.states.get(DOMAIN + '.toggle_test').state == 'off'
 
 
-@asyncio.coroutine
-def test_group_alias(hass, monkeypatch):
+async def test_group_alias(hass, monkeypatch):
     """Group aliases should only respond to group commands (allon/alloff)."""
     config = {
         'rflink': {
@@ -424,7 +433,7 @@ def test_group_alias(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    event_callback, _, _, _ = yield from mock_rflink(
+    event_callback, _, _, _ = await mock_rflink(
         hass, config, DOMAIN, monkeypatch)
 
     assert hass.states.get(DOMAIN + '.test').state == 'off'
@@ -434,7 +443,7 @@ def test_group_alias(hass, monkeypatch):
         'id': 'test_group_0_0',
         'command': 'allon',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert hass.states.get(DOMAIN + '.test').state == 'on'
 
@@ -443,13 +452,12 @@ def test_group_alias(hass, monkeypatch):
         'id': 'test_group_0_0',
         'command': 'off',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert hass.states.get(DOMAIN + '.test').state == 'on'
 
 
-@asyncio.coroutine
-def test_nogroup_alias(hass, monkeypatch):
+async def test_nogroup_alias(hass, monkeypatch):
     """Non group aliases should not respond to group commands."""
     config = {
         'rflink': {
@@ -467,7 +475,7 @@ def test_nogroup_alias(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    event_callback, _, _, _ = yield from mock_rflink(
+    event_callback, _, _, _ = await mock_rflink(
         hass, config, DOMAIN, monkeypatch)
 
     assert hass.states.get(DOMAIN + '.test').state == 'off'
@@ -477,7 +485,7 @@ def test_nogroup_alias(hass, monkeypatch):
         'id': 'test_nogroup_0_0',
         'command': 'allon',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
     # should not affect state
     assert hass.states.get(DOMAIN + '.test').state == 'off'
 
@@ -486,13 +494,12 @@ def test_nogroup_alias(hass, monkeypatch):
         'id': 'test_nogroup_0_0',
         'command': 'on',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
     # should affect state
     assert hass.states.get(DOMAIN + '.test').state == 'on'
 
 
-@asyncio.coroutine
-def test_nogroup_device_id(hass, monkeypatch):
+async def test_nogroup_device_id(hass, monkeypatch):
     """Device id that do not respond to group commands (allon/alloff)."""
     config = {
         'rflink': {
@@ -510,7 +517,7 @@ def test_nogroup_device_id(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    event_callback, _, _, _ = yield from mock_rflink(
+    event_callback, _, _, _ = await mock_rflink(
         hass, config, DOMAIN, monkeypatch)
 
     assert hass.states.get(DOMAIN + '.test').state == 'off'
@@ -520,7 +527,7 @@ def test_nogroup_device_id(hass, monkeypatch):
         'id': 'test_nogroup_0_0',
         'command': 'allon',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
     # should not affect state
     assert hass.states.get(DOMAIN + '.test').state == 'off'
 
@@ -529,13 +536,12 @@ def test_nogroup_device_id(hass, monkeypatch):
         'id': 'test_nogroup_0_0',
         'command': 'on',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
     # should affect state
     assert hass.states.get(DOMAIN + '.test').state == 'on'
 
 
-@asyncio.coroutine
-def test_disable_automatic_add(hass, monkeypatch):
+async def test_disable_automatic_add(hass, monkeypatch):
     """If disabled new devices should not be automatically added."""
     config = {
         'rflink': {
@@ -548,7 +554,7 @@ def test_disable_automatic_add(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    event_callback, _, _, _ = yield from mock_rflink(
+    event_callback, _, _, _ = await mock_rflink(
         hass, config, DOMAIN, monkeypatch)
 
     # test event for new unconfigured sensor
@@ -556,7 +562,81 @@ def test_disable_automatic_add(hass, monkeypatch):
         'id': 'protocol_0_0',
         'command': 'off',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     # make sure new device is not added
     assert not hass.states.get(DOMAIN + '.protocol_0_0')
+
+
+async def test_restore_state(hass, monkeypatch):
+    """Ensure states are restored on startup."""
+    config = {
+        'rflink': {
+            'port': '/dev/ttyABC0',
+        },
+        DOMAIN: {
+            'platform': 'rflink',
+            'devices': {
+                'NewKaku_12345678_0': {
+                    'name': 'l1',
+                    'type': 'hybrid',
+                },
+                'test_restore_2': {
+                    'name': 'l2',
+                },
+                'test_restore_3': {
+                    'name': 'l3',
+                },
+                'test_restore_4': {
+                    'name': 'l4',
+                    'type': 'dimmable',
+                },
+                'test_restore_5': {
+                    'name': 'l5',
+                    'type': 'dimmable',
+                },
+            },
+        },
+    }
+
+    mock_restore_cache(hass, (
+        State(DOMAIN + '.l1', STATE_ON, {ATTR_BRIGHTNESS: "123", }),
+        State(DOMAIN + '.l2', STATE_ON, {ATTR_BRIGHTNESS: "321", }),
+        State(DOMAIN + '.l3', STATE_OFF, ),
+        State(DOMAIN + '.l5', STATE_ON, {ATTR_BRIGHTNESS: "222", }),
+    ))
+
+    hass.state = CoreState.starting
+
+    # setup mocking rflink module
+    _, _, _, _ = await mock_rflink(hass, config, DOMAIN, monkeypatch)
+
+    # hybrid light must restore brightness
+    state = hass.states.get(DOMAIN + '.l1')
+    assert state
+    assert state.state == STATE_ON
+    assert state.attributes[ATTR_BRIGHTNESS] == 123
+
+    # normal light do NOT must restore brightness
+    state = hass.states.get(DOMAIN + '.l2')
+    assert state
+    assert state.state == STATE_ON
+    assert not state.attributes.get(ATTR_BRIGHTNESS)
+
+    # OFF state also restores (or not)
+    state = hass.states.get(DOMAIN + '.l3')
+    assert state
+    assert state.state == STATE_OFF
+
+    # not cached light must default values
+    state = hass.states.get(DOMAIN + '.l4')
+    assert state
+    assert state.state == STATE_OFF
+    assert not state.attributes.get(ATTR_BRIGHTNESS)
+    assert state.attributes['assumed_state']
+
+    # test coverage for dimmable light
+    state = hass.states.get(DOMAIN + '.l5')
+    assert state
+    assert state.state == STATE_ON
+    assert state.attributes[ATTR_BRIGHTNESS] == 222
diff --git a/tests/components/lock/test_mqtt.py b/tests/components/lock/test_mqtt.py
index 58f328c5b9d..0fcb97f1b68 100644
--- a/tests/components/lock/test_mqtt.py
+++ b/tests/components/lock/test_mqtt.py
@@ -1,11 +1,14 @@
 """The tests for the MQTT lock platform."""
+import json
+
 from homeassistant.setup import async_setup_component
 from homeassistant.const import (
     STATE_LOCKED, STATE_UNLOCKED, STATE_UNAVAILABLE, ATTR_ASSUMED_STATE)
 from homeassistant.components import lock, mqtt
 from homeassistant.components.mqtt.discovery import async_start
 
-from tests.common import async_fire_mqtt_message, MockConfigEntry
+from tests.common import (
+    async_fire_mqtt_message, async_mock_mqtt_component, MockConfigEntry)
 
 
 async def test_controlling_state_via_topic(hass, mqtt_mock):
@@ -134,6 +137,29 @@ async def test_custom_availability_payload(hass, mqtt_mock):
     assert state.state is STATE_UNAVAILABLE
 
 
+async def test_unique_id(hass):
+    """Test unique id option only creates one light per unique_id."""
+    await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, lock.DOMAIN, {
+        lock.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'Test 1',
+            'status_topic': 'test-topic',
+            'command_topic': 'test_topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }, {
+            'platform': 'mqtt',
+            'name': 'Test 2',
+            'status_topic': 'test-topic',
+            'command_topic': 'test_topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+    async_fire_mqtt_message(hass, 'test-topic', 'payload')
+    await hass.async_block_till_done()
+    assert len(hass.states.async_entity_ids(lock.DOMAIN)) == 1
+
+
 async def test_discovery_removal_lock(hass, mqtt_mock, caplog):
     """Test removal of discovered lock."""
     entry = MockConfigEntry(domain=mqtt.DOMAIN)
@@ -154,3 +180,42 @@ async def test_discovery_removal_lock(hass, mqtt_mock, caplog):
     await hass.async_block_till_done()
     state = hass.states.get('lock.beer')
     assert state is None
+
+
+async def test_entity_device_info_with_identifier(hass, mqtt_mock):
+    """Test MQTT lock device registry integration."""
+    entry = MockConfigEntry(domain=mqtt.DOMAIN)
+    entry.add_to_hass(hass)
+    await async_start(hass, 'homeassistant', {}, entry)
+    registry = await hass.helpers.device_registry.async_get_registry()
+
+    data = json.dumps({
+        'platform': 'mqtt',
+        'name': 'Test 1',
+        'state_topic': 'test-topic',
+        'command_topic': 'test-topic',
+        'device': {
+            'identifiers': ['helloworld'],
+            'connections': [
+                ["mac", "02:5b:26:a8:dc:12"],
+            ],
+            'manufacturer': 'Whatever',
+            'name': 'Beer',
+            'model': 'Glass',
+            'sw_version': '0.1-beta',
+        },
+        'unique_id': 'veryunique'
+    })
+    async_fire_mqtt_message(hass, 'homeassistant/lock/bla/config',
+                            data)
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    device = registry.async_get_device({('mqtt', 'helloworld')}, set())
+    assert device is not None
+    assert device.identifiers == {('mqtt', 'helloworld')}
+    assert device.connections == {('mac', "02:5b:26:a8:dc:12")}
+    assert device.manufacturer == 'Whatever'
+    assert device.name == 'Beer'
+    assert device.model == 'Glass'
+    assert device.sw_version == '0.1-beta'
diff --git a/tests/components/media_player/test_directv.py b/tests/components/media_player/test_directv.py
index 951f1319cc0..d8e561d8d2a 100644
--- a/tests/components/media_player/test_directv.py
+++ b/tests/components/media_player/test_directv.py
@@ -515,7 +515,7 @@ async def test_available(hass, platforms, main_dtv, mock_now):
     state = hass.states.get(MAIN_ENTITY_ID)
     assert state.state != STATE_UNAVAILABLE
 
-    # Make update fail (i.e. DVR offline)
+    # Make update fail 1st time
     next_update = next_update + timedelta(minutes=5)
     with patch.object(
             main_dtv, 'get_standby', side_effect=requests.RequestException), \
@@ -523,6 +523,28 @@ async def test_available(hass, platforms, main_dtv, mock_now):
         async_fire_time_changed(hass, next_update)
         await hass.async_block_till_done()
 
+    state = hass.states.get(MAIN_ENTITY_ID)
+    assert state.state != STATE_UNAVAILABLE
+
+    # Make update fail 2nd time within 1 minute
+    next_update = next_update + timedelta(seconds=30)
+    with patch.object(
+            main_dtv, 'get_standby', side_effect=requests.RequestException), \
+            patch('homeassistant.util.dt.utcnow', return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+        await hass.async_block_till_done()
+
+    state = hass.states.get(MAIN_ENTITY_ID)
+    assert state.state != STATE_UNAVAILABLE
+
+    # Make update fail 3rd time more then a minute after 1st failure
+    next_update = next_update + timedelta(minutes=1)
+    with patch.object(
+            main_dtv, 'get_standby', side_effect=requests.RequestException), \
+            patch('homeassistant.util.dt.utcnow', return_value=next_update):
+        async_fire_time_changed(hass, next_update)
+        await hass.async_block_till_done()
+
     state = hass.states.get(MAIN_ENTITY_ID)
     assert state.state == STATE_UNAVAILABLE
 
diff --git a/tests/components/recorder/test_purge.py b/tests/components/recorder/test_purge.py
index 4249a8abfb9..7b03c7c3d8a 100644
--- a/tests/components/recorder/test_purge.py
+++ b/tests/components/recorder/test_purge.py
@@ -58,23 +58,6 @@ class TestRecorderPurge(unittest.TestCase):
                     event_id=event_id + 1000
                 ))
 
-            # if self._add_test_events was called, we added a special event
-            # that should be protected from deletion, too
-            protected_event_id = getattr(self, "_protected_event_id", 2000)
-
-            # add a state that is old but the only state of its entity and
-            # should be protected
-            session.add(States(
-                entity_id='test.rarely_updated_entity',
-                domain='sensor',
-                state='iamprotected',
-                attributes=json.dumps(attributes),
-                last_changed=eleven_days_ago,
-                last_updated=eleven_days_ago,
-                created=eleven_days_ago,
-                event_id=protected_event_id
-            ))
-
     def _add_test_events(self):
         """Add a few events for testing."""
         now = datetime.now()
@@ -105,32 +88,19 @@ class TestRecorderPurge(unittest.TestCase):
                     time_fired=timestamp,
                 ))
 
-            # Add an event for the protected state
-            protected_event = Events(
-                event_type='EVENT_TEST_FOR_PROTECTED',
-                event_data=json.dumps(event_data),
-                origin='LOCAL',
-                created=eleven_days_ago,
-                time_fired=eleven_days_ago,
-            )
-            session.add(protected_event)
-            session.flush()
-
-            self._protected_event_id = protected_event.event_id
-
     def test_purge_old_states(self):
         """Test deleting old states."""
         self._add_test_states()
-        # make sure we start with 7 states
+        # make sure we start with 6 states
         with session_scope(hass=self.hass) as session:
             states = session.query(States)
-            assert states.count() == 7
+            assert states.count() == 6
 
             # run purge_old_data()
             purge_old_data(self.hass.data[DATA_INSTANCE], 4, repack=False)
 
-            # we should only have 3 states left after purging
-            assert states.count() == 3
+            # we should only have 2 states left after purging
+            assert states.count() == 2
 
     def test_purge_old_events(self):
         """Test deleting old events."""
@@ -139,12 +109,12 @@ class TestRecorderPurge(unittest.TestCase):
         with session_scope(hass=self.hass) as session:
             events = session.query(Events).filter(
                 Events.event_type.like("EVENT_TEST%"))
-            assert events.count() == 7
+            assert events.count() == 6
 
             # run purge_old_data()
             purge_old_data(self.hass.data[DATA_INSTANCE], 4, repack=False)
 
-            # no state to protect, now we should only have 2 events left
+            # we should only have 2 events left
             assert events.count() == 2
 
     def test_purge_method(self):
@@ -156,11 +126,11 @@ class TestRecorderPurge(unittest.TestCase):
         # make sure we start with 6 states
         with session_scope(hass=self.hass) as session:
             states = session.query(States)
-            assert states.count() == 7
+            assert states.count() == 6
 
             events = session.query(Events).filter(
                 Events.event_type.like("EVENT_TEST%"))
-            assert events.count() == 7
+            assert events.count() == 6
 
             self.hass.data[DATA_INSTANCE].block_till_done()
 
@@ -172,8 +142,8 @@ class TestRecorderPurge(unittest.TestCase):
             self.hass.data[DATA_INSTANCE].block_till_done()
 
             # only purged old events
-            assert states.count() == 5
-            assert events.count() == 5
+            assert states.count() == 4
+            assert events.count() == 4
 
             # run purge method - correct service data
             self.hass.services.call('recorder', 'purge',
@@ -183,19 +153,12 @@ class TestRecorderPurge(unittest.TestCase):
             # Small wait for recorder thread
             self.hass.data[DATA_INSTANCE].block_till_done()
 
-            # we should only have 3 states left after purging
-            assert states.count() == 3
+            # we should only have 2 states left after purging
+            assert states.count() == 2
 
-            # the protected state is among them
-            assert 'iamprotected' in (
-                state.state for state in states)
+            # now we should only have 2 events left
+            assert events.count() == 2
 
-            # now we should only have 3 events left
-            assert events.count() == 3
-
-            # and the protected event is among them
-            assert 'EVENT_TEST_FOR_PROTECTED' in (
-                event.event_type for event in events.all())
             assert not ('EVENT_TEST_PURGE' in (
                 event.event_type for event in events.all()))
 
diff --git a/tests/components/sensor/test_awair.py b/tests/components/sensor/test_awair.py
index b539bdbfe7d..e00cc816518 100644
--- a/tests/components/sensor/test_awair.py
+++ b/tests/components/sensor/test_awair.py
@@ -8,65 +8,69 @@ from unittest.mock import patch
 
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
 from homeassistant.components.sensor.awair import (
-    ATTR_LAST_API_UPDATE, ATTR_TIMESTAMP, DEVICE_CLASS_CARBON_DIOXIDE,
-    DEVICE_CLASS_PM2_5, DEVICE_CLASS_SCORE,
-    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS)
+    ATTR_LAST_API_UPDATE,
+    ATTR_TIMESTAMP,
+    DEVICE_CLASS_CARBON_DIOXIDE,
+    DEVICE_CLASS_PM2_5,
+    DEVICE_CLASS_SCORE,
+    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
+)
 from homeassistant.const import (
-    DEVICE_CLASS_HUMIDITY, DEVICE_CLASS_TEMPERATURE, STATE_UNAVAILABLE,
-    TEMP_CELSIUS)
+    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_TEMPERATURE,
+    STATE_UNAVAILABLE,
+    TEMP_CELSIUS,
+)
 from homeassistant.setup import async_setup_component
 from homeassistant.util.dt import parse_datetime, utcnow
 
 from tests.common import async_fire_time_changed, load_fixture, mock_coro
 
-DISCOVERY_CONFIG = {
-    'sensor': {
-        'platform': 'awair',
-        'access_token': 'qwerty',
-    }
-}
+DISCOVERY_CONFIG = {"sensor": {"platform": "awair", "access_token": "qwerty"}}
 
 MANUAL_CONFIG = {
-    'sensor': {
-        'platform': 'awair',
-        'access_token': 'qwerty',
-        'devices': [
-            {'uuid': 'awair_foo'}
-        ]
+    "sensor": {
+        "platform": "awair",
+        "access_token": "qwerty",
+        "devices": [{"uuid": "awair_foo"}],
     }
 }
 
 _LOGGER = logging.getLogger(__name__)
 
 NOW = utcnow()
-AIR_DATA_FIXTURE = json.loads(load_fixture('awair_air_data_latest.json'))
+AIR_DATA_FIXTURE = json.loads(load_fixture("awair_air_data_latest.json"))
 AIR_DATA_FIXTURE[0][ATTR_TIMESTAMP] = str(NOW)
 AIR_DATA_FIXTURE_UPDATED = json.loads(
-    load_fixture('awair_air_data_latest_updated.json'))
+    load_fixture("awair_air_data_latest_updated.json")
+)
 AIR_DATA_FIXTURE_UPDATED[0][ATTR_TIMESTAMP] = str(NOW + timedelta(minutes=5))
+AIR_DATA_FIXTURE_EMPTY = []
 
 
 @contextmanager
 def alter_time(retval):
     """Manage multiple time mocks."""
-    patch_one = patch('homeassistant.util.dt.utcnow', return_value=retval)
-    patch_two = patch('homeassistant.util.utcnow', return_value=retval)
-    patch_three = patch('homeassistant.components.sensor.awair.dt.utcnow',
-                        return_value=retval)
+    patch_one = patch("homeassistant.util.dt.utcnow", return_value=retval)
+    patch_two = patch("homeassistant.util.utcnow", return_value=retval)
+    patch_three = patch(
+        "homeassistant.components.sensor.awair.dt.utcnow", return_value=retval
+    )
 
     with patch_one, patch_two, patch_three:
         yield
 
 
-async def setup_awair(hass, config=None):
+async def setup_awair(hass, config=None, data_fixture=AIR_DATA_FIXTURE):
     """Load the Awair platform."""
-    devices_json = json.loads(load_fixture('awair_devices.json'))
+    devices_json = json.loads(load_fixture("awair_devices.json"))
     devices_mock = mock_coro(devices_json)
-    devices_patch = patch('python_awair.AwairClient.devices',
-                          return_value=devices_mock)
-    air_data_mock = mock_coro(AIR_DATA_FIXTURE)
-    air_data_patch = patch('python_awair.AwairClient.air_data_latest',
-                           return_value=air_data_mock)
+    devices_patch = patch(
+        "python_awair.AwairClient.devices", return_value=devices_mock)
+    air_data_mock = mock_coro(data_fixture)
+    air_data_patch = patch(
+        "python_awair.AwairClient.air_data_latest", return_value=air_data_mock
+    )
 
     if config is None:
         config = DISCOVERY_CONFIG
@@ -84,8 +88,8 @@ async def test_platform_manually_configured(hass):
 
     # Ensure that we loaded the device with uuid 'awair_foo', not the
     # 'awair_12345' device that we stub out for API device discovery
-    entity = hass.data[SENSOR_DOMAIN].get_entity('sensor.awair_co2')
-    assert entity.unique_id == 'awair_foo_CO2'
+    entity = hass.data[SENSOR_DOMAIN].get_entity("sensor.awair_co2")
+    assert entity.unique_id == "awair_foo_CO2"
 
 
 async def test_platform_automatically_configured(hass):
@@ -96,95 +100,109 @@ async def test_platform_automatically_configured(hass):
 
     # Ensure that we loaded the device with uuid 'awair_12345', which is
     # the device that we stub out for API device discovery
-    entity = hass.data[SENSOR_DOMAIN].get_entity('sensor.awair_co2')
-    assert entity.unique_id == 'awair_12345_CO2'
+    entity = hass.data[SENSOR_DOMAIN].get_entity("sensor.awair_co2")
+    assert entity.unique_id == "awair_12345_CO2"
 
 
 async def test_bad_platform_setup(hass):
     """Tests that we throw correct exceptions when setting up Awair."""
     from python_awair import AwairClient
 
-    auth_patch = patch('python_awair.AwairClient.devices',
-                       side_effect=AwairClient.AuthError)
-    rate_patch = patch('python_awair.AwairClient.devices',
-                       side_effect=AwairClient.RatelimitError)
-    generic_patch = patch('python_awair.AwairClient.devices',
-                          side_effect=AwairClient.GenericError)
+    auth_patch = patch(
+        "python_awair.AwairClient.devices",
+        side_effect=AwairClient.AuthError
+    )
+    rate_patch = patch(
+        "python_awair.AwairClient.devices",
+        side_effect=AwairClient.RatelimitError
+    )
+    generic_patch = patch(
+        "python_awair.AwairClient.devices",
+        side_effect=AwairClient.GenericError
+    )
 
     with auth_patch:
-        assert await async_setup_component(hass, SENSOR_DOMAIN,
-                                           DISCOVERY_CONFIG)
+        assert await async_setup_component(
+            hass, SENSOR_DOMAIN, DISCOVERY_CONFIG)
         assert not hass.states.async_all()
 
     with rate_patch:
-        assert await async_setup_component(hass, SENSOR_DOMAIN,
-                                           DISCOVERY_CONFIG)
+        assert await async_setup_component(
+            hass, SENSOR_DOMAIN, DISCOVERY_CONFIG)
         assert not hass.states.async_all()
 
     with generic_patch:
-        assert await async_setup_component(hass, SENSOR_DOMAIN,
-                                           DISCOVERY_CONFIG)
+        assert await async_setup_component(
+            hass, SENSOR_DOMAIN, DISCOVERY_CONFIG)
         assert not hass.states.async_all()
 
 
+async def test_awair_setup_no_data(hass):
+    """Ensure that we do not crash during setup when no data is returned."""
+    await setup_awair(hass, data_fixture=AIR_DATA_FIXTURE_EMPTY)
+    assert not hass.states.async_all()
+
+
 async def test_awair_misc_attributes(hass):
     """Test that desired attributes are set."""
     await setup_awair(hass)
 
-    attributes = hass.states.get('sensor.awair_co2').attributes
-    assert (attributes[ATTR_LAST_API_UPDATE] ==
-            parse_datetime(AIR_DATA_FIXTURE[0][ATTR_TIMESTAMP]))
+    attributes = hass.states.get("sensor.awair_co2").attributes
+    assert attributes[ATTR_LAST_API_UPDATE] == parse_datetime(
+        AIR_DATA_FIXTURE[0][ATTR_TIMESTAMP]
+    )
 
 
 async def test_awair_score(hass):
     """Test that we create a sensor for the 'Awair score'."""
     await setup_awair(hass)
 
-    sensor = hass.states.get('sensor.awair_score')
-    assert sensor.state == '78'
-    assert sensor.attributes['device_class'] == DEVICE_CLASS_SCORE
-    assert sensor.attributes['unit_of_measurement'] == '%'
+    sensor = hass.states.get("sensor.awair_score")
+    assert sensor.state == "78"
+    assert sensor.attributes["device_class"] == DEVICE_CLASS_SCORE
+    assert sensor.attributes["unit_of_measurement"] == "%"
 
 
 async def test_awair_temp(hass):
     """Test that we create a temperature sensor."""
     await setup_awair(hass)
 
-    sensor = hass.states.get('sensor.awair_temperature')
-    assert sensor.state == '22.4'
-    assert sensor.attributes['device_class'] == DEVICE_CLASS_TEMPERATURE
-    assert sensor.attributes['unit_of_measurement'] == TEMP_CELSIUS
+    sensor = hass.states.get("sensor.awair_temperature")
+    assert sensor.state == "22.4"
+    assert sensor.attributes["device_class"] == DEVICE_CLASS_TEMPERATURE
+    assert sensor.attributes["unit_of_measurement"] == TEMP_CELSIUS
 
 
 async def test_awair_humid(hass):
     """Test that we create a humidity sensor."""
     await setup_awair(hass)
 
-    sensor = hass.states.get('sensor.awair_humidity')
-    assert sensor.state == '32.73'
-    assert sensor.attributes['device_class'] == DEVICE_CLASS_HUMIDITY
-    assert sensor.attributes['unit_of_measurement'] == '%'
+    sensor = hass.states.get("sensor.awair_humidity")
+    assert sensor.state == "32.73"
+    assert sensor.attributes["device_class"] == DEVICE_CLASS_HUMIDITY
+    assert sensor.attributes["unit_of_measurement"] == "%"
 
 
 async def test_awair_co2(hass):
     """Test that we create a CO2 sensor."""
     await setup_awair(hass)
 
-    sensor = hass.states.get('sensor.awair_co2')
-    assert sensor.state == '612'
-    assert sensor.attributes['device_class'] == DEVICE_CLASS_CARBON_DIOXIDE
-    assert sensor.attributes['unit_of_measurement'] == 'ppm'
+    sensor = hass.states.get("sensor.awair_co2")
+    assert sensor.state == "612"
+    assert sensor.attributes["device_class"] == \
+        DEVICE_CLASS_CARBON_DIOXIDE
+    assert sensor.attributes["unit_of_measurement"] == "ppm"
 
 
 async def test_awair_voc(hass):
     """Test that we create a CO2 sensor."""
     await setup_awair(hass)
 
-    sensor = hass.states.get('sensor.awair_voc')
-    assert sensor.state == '1012'
-    assert (sensor.attributes['device_class'] ==
-            DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS)
-    assert sensor.attributes['unit_of_measurement'] == 'ppb'
+    sensor = hass.states.get("sensor.awair_voc")
+    assert sensor.state == "1012"
+    assert sensor.attributes["device_class"] == \
+        DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS
+    assert sensor.attributes["unit_of_measurement"] == "ppb"
 
 
 async def test_awair_dust(hass):
@@ -193,10 +211,10 @@ async def test_awair_dust(hass):
 
     # The Awair Gen1 that we mock actually returns 'DUST', but that
     # is mapped to pm25 internally so that it shows up in Homekit
-    sensor = hass.states.get('sensor.awair_pm25')
-    assert sensor.state == '6.2'
-    assert sensor.attributes['device_class'] == DEVICE_CLASS_PM2_5
-    assert sensor.attributes['unit_of_measurement'] == 'µg/m3'
+    sensor = hass.states.get("sensor.awair_pm2_5")
+    assert sensor.state == "6.2"
+    assert sensor.attributes["device_class"] == DEVICE_CLASS_PM2_5
+    assert sensor.attributes["unit_of_measurement"] == "µg/m3"
 
 
 async def test_awair_unsupported_sensors(hass):
@@ -206,36 +224,53 @@ async def test_awair_unsupported_sensors(hass):
     # Our tests mock an Awair Gen 1 device, which should never return
     # PM10 sensor readings. Assert that we didn't create a pm10 sensor,
     # which could happen if someone were ever to refactor incorrectly.
-    assert hass.states.get('sensor.awair_pm10') is None
+    assert hass.states.get("sensor.awair_pm10") is None
 
 
 async def test_availability(hass):
     """Ensure that we mark the component available/unavailable correctly."""
     await setup_awair(hass)
 
-    assert hass.states.get('sensor.awair_score').state == '78'
+    assert hass.states.get("sensor.awair_score").state == "78"
 
     future = NOW + timedelta(minutes=30)
-    data_patch = patch('python_awair.AwairClient.air_data_latest',
-                       return_value=mock_coro(AIR_DATA_FIXTURE))
+    data_patch = patch(
+        "python_awair.AwairClient.air_data_latest",
+        return_value=mock_coro(AIR_DATA_FIXTURE),
+    )
 
     with data_patch, alter_time(future):
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get('sensor.awair_score').state == STATE_UNAVAILABLE
+    assert hass.states.get("sensor.awair_score").state == STATE_UNAVAILABLE
 
     future = NOW + timedelta(hours=1)
     fixture = AIR_DATA_FIXTURE_UPDATED
     fixture[0][ATTR_TIMESTAMP] = str(future)
-    data_patch = patch('python_awair.AwairClient.air_data_latest',
-                       return_value=mock_coro(fixture))
+    data_patch = patch(
+        "python_awair.AwairClient.air_data_latest",
+        return_value=mock_coro(fixture)
+    )
 
     with data_patch, alter_time(future):
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get('sensor.awair_score').state == '79'
+    assert hass.states.get("sensor.awair_score").state == "79"
+
+    future = NOW + timedelta(minutes=90)
+    fixture = AIR_DATA_FIXTURE_EMPTY
+    data_patch = patch(
+        "python_awair.AwairClient.air_data_latest",
+        return_value=mock_coro(fixture)
+    )
+
+    with data_patch, alter_time(future):
+        async_fire_time_changed(hass, future)
+        await hass.async_block_till_done()
+
+    assert hass.states.get("sensor.awair_score").state == STATE_UNAVAILABLE
 
 
 async def test_async_update(hass):
@@ -243,21 +278,23 @@ async def test_async_update(hass):
     await setup_awair(hass)
 
     future = NOW + timedelta(minutes=10)
-    data_patch = patch('python_awair.AwairClient.air_data_latest',
-                       return_value=mock_coro(AIR_DATA_FIXTURE_UPDATED))
+    data_patch = patch(
+        "python_awair.AwairClient.air_data_latest",
+        return_value=mock_coro(AIR_DATA_FIXTURE_UPDATED),
+    )
 
     with data_patch, alter_time(future):
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    score_sensor = hass.states.get('sensor.awair_score')
-    assert score_sensor.state == '79'
+    score_sensor = hass.states.get("sensor.awair_score")
+    assert score_sensor.state == "79"
 
-    assert hass.states.get('sensor.awair_temperature').state == '23.4'
-    assert hass.states.get('sensor.awair_humidity').state == '33.73'
-    assert hass.states.get('sensor.awair_co2').state == '613'
-    assert hass.states.get('sensor.awair_voc').state == '1013'
-    assert hass.states.get('sensor.awair_pm25').state == '7.2'
+    assert hass.states.get("sensor.awair_temperature").state == "23.4"
+    assert hass.states.get("sensor.awair_humidity").state == "33.73"
+    assert hass.states.get("sensor.awair_co2").state == "613"
+    assert hass.states.get("sensor.awair_voc").state == "1013"
+    assert hass.states.get("sensor.awair_pm2_5").state == "7.2"
 
 
 async def test_throttle_async_update(hass):
@@ -265,18 +302,20 @@ async def test_throttle_async_update(hass):
     await setup_awair(hass)
 
     future = NOW + timedelta(minutes=1)
-    data_patch = patch('python_awair.AwairClient.air_data_latest',
-                       return_value=mock_coro(AIR_DATA_FIXTURE_UPDATED))
+    data_patch = patch(
+        "python_awair.AwairClient.air_data_latest",
+        return_value=mock_coro(AIR_DATA_FIXTURE_UPDATED),
+    )
 
     with data_patch, alter_time(future):
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get('sensor.awair_score').state == '78'
+    assert hass.states.get("sensor.awair_score").state == "78"
 
     future = NOW + timedelta(minutes=15)
     with data_patch, alter_time(future):
         async_fire_time_changed(hass, future)
         await hass.async_block_till_done()
 
-    assert hass.states.get('sensor.awair_score').state == '79'
+    assert hass.states.get("sensor.awair_score").state == "79"
diff --git a/tests/components/sensor/test_fail2ban.py b/tests/components/sensor/test_fail2ban.py
index 6ba959f80ff..a48b7027725 100644
--- a/tests/components/sensor/test_fail2ban.py
+++ b/tests/components/sensor/test_fail2ban.py
@@ -2,7 +2,6 @@
 import unittest
 from unittest.mock import Mock, patch
 
-from datetime import timedelta
 from mock_open import MockOpen
 
 from homeassistant.setup import setup_component
@@ -99,7 +98,7 @@ class TestBanSensor(unittest.TestCase):
 
     def test_single_ban(self):
         """Test that log is parsed correctly for single ban."""
-        log_parser = BanLogParser(timedelta(seconds=-1), '/tmp')
+        log_parser = BanLogParser('/tmp')
         sensor = BanSensor('fail2ban', 'jail_one', log_parser)
         assert sensor.name == 'fail2ban jail_one'
         mock_fh = MockOpen(read_data=fake_log('single_ban'))
@@ -115,7 +114,7 @@ class TestBanSensor(unittest.TestCase):
 
     def test_multiple_ban(self):
         """Test that log is parsed correctly for multiple ban."""
-        log_parser = BanLogParser(timedelta(seconds=-1), '/tmp')
+        log_parser = BanLogParser('/tmp')
         sensor = BanSensor('fail2ban', 'jail_one', log_parser)
         assert sensor.name == 'fail2ban jail_one'
         mock_fh = MockOpen(read_data=fake_log('multi_ban'))
@@ -131,7 +130,7 @@ class TestBanSensor(unittest.TestCase):
 
     def test_unban_all(self):
         """Test that log is parsed correctly when unbanning."""
-        log_parser = BanLogParser(timedelta(seconds=-1), '/tmp')
+        log_parser = BanLogParser('/tmp')
         sensor = BanSensor('fail2ban', 'jail_one', log_parser)
         assert sensor.name == 'fail2ban jail_one'
         mock_fh = MockOpen(read_data=fake_log('unban_all'))
@@ -146,7 +145,7 @@ class TestBanSensor(unittest.TestCase):
 
     def test_unban_one(self):
         """Test that log is parsed correctly when unbanning one ip."""
-        log_parser = BanLogParser(timedelta(seconds=-1), '/tmp')
+        log_parser = BanLogParser('/tmp')
         sensor = BanSensor('fail2ban', 'jail_one', log_parser)
         assert sensor.name == 'fail2ban jail_one'
         mock_fh = MockOpen(read_data=fake_log('unban_one'))
@@ -162,7 +161,7 @@ class TestBanSensor(unittest.TestCase):
 
     def test_multi_jail(self):
         """Test that log is parsed correctly when using multiple jails."""
-        log_parser = BanLogParser(timedelta(seconds=-1), '/tmp')
+        log_parser = BanLogParser('/tmp')
         sensor1 = BanSensor('fail2ban', 'jail_one', log_parser)
         sensor2 = BanSensor('fail2ban', 'jail_two', log_parser)
         assert sensor1.name == 'fail2ban jail_one'
@@ -184,7 +183,7 @@ class TestBanSensor(unittest.TestCase):
 
     def test_ban_active_after_update(self):
         """Test that ban persists after subsequent update."""
-        log_parser = BanLogParser(timedelta(seconds=-1), '/tmp')
+        log_parser = BanLogParser('/tmp')
         sensor = BanSensor('fail2ban', 'jail_one', log_parser)
         assert sensor.name == 'fail2ban jail_one'
         mock_fh = MockOpen(read_data=fake_log('single_ban'))
diff --git a/tests/components/sensor/test_filesize.py b/tests/components/sensor/test_filesize.py
index f0ea5c95de5..b8b5c67da7d 100644
--- a/tests/components/sensor/test_filesize.py
+++ b/tests/components/sensor/test_filesize.py
@@ -8,12 +8,12 @@ from tests.common import get_test_home_assistant
 
 
 TEST_DIR = os.path.join(os.path.dirname(__file__))
-TEST_FILE = os.path.join(TEST_DIR, 'mock_file_test_filesize.txt')
+TEST_FILE = os.path.join(TEST_DIR, "mock_file_test_filesize.txt")
 
 
 def create_file(path):
     """Create a test file."""
-    with open(path, 'w') as test_file:
+    with open(path, "w") as test_file:
         test_file.write("test")
 
 
@@ -34,23 +34,23 @@ class TestFileSensor(unittest.TestCase):
     def test_invalid_path(self):
         """Test that an invalid path is caught."""
         config = {
-            'sensor': {
-                'platform': 'filesize',
-                CONF_FILE_PATHS: ['invalid_path']}
+            "sensor": {
+                "platform": "filesize", CONF_FILE_PATHS: ["invalid_path"]
+            }
         }
-        assert setup_component(self.hass, 'sensor', config)
+        assert setup_component(self.hass, "sensor", config)
         assert len(self.hass.states.entity_ids()) == 0
 
     def test_valid_path(self):
         """Test for a valid path."""
         create_file(TEST_FILE)
         config = {
-            'sensor': {
-                'platform': 'filesize',
-                CONF_FILE_PATHS: [TEST_FILE]}
+            "sensor": {
+                "platform": "filesize", CONF_FILE_PATHS: [TEST_FILE]
+            }
         }
-        assert setup_component(self.hass, 'sensor', config)
+        assert setup_component(self.hass, "sensor", config)
         assert len(self.hass.states.entity_ids()) == 1
-        state = self.hass.states.get('sensor.mock_file_test_filesizetxt')
-        assert state.state == '0.0'
-        assert state.attributes.get('bytes') == 4
+        state = self.hass.states.get("sensor.mock_file_test_filesize_txt")
+        assert state.state == "0.0"
+        assert state.attributes.get("bytes") == 4
diff --git a/tests/components/sensor/test_foobot.py b/tests/components/sensor/test_foobot.py
index f9382a04b6b..71f2d0481bf 100644
--- a/tests/components/sensor/test_foobot.py
+++ b/tests/components/sensor/test_foobot.py
@@ -32,7 +32,7 @@ async def test_default_setup(hass, aioclient_mock):
     metrics = {'co2': ['1232.0', 'ppm'],
                'temperature': ['21.1', TEMP_CELSIUS],
                'humidity': ['49.5', '%'],
-               'pm25': ['144.8', 'µg/m3'],
+               'pm2_5': ['144.8', 'µg/m3'],
                'voc': ['340.7', 'ppb'],
                'index': ['138.9', '%']}
 
diff --git a/tests/components/sensor/test_geo_rss_events.py b/tests/components/sensor/test_geo_rss_events.py
index 988b7b686ab..fae5016cf91 100644
--- a/tests/components/sensor/test_geo_rss_events.py
+++ b/tests/components/sensor/test_geo_rss_events.py
@@ -1,11 +1,8 @@
 """The test for the geo rss events sensor platform."""
 import unittest
 from unittest import mock
-import sys
 from unittest.mock import MagicMock, patch
 
-import pytest
-
 from homeassistant.components import sensor
 from homeassistant.const import ATTR_UNIT_OF_MEASUREMENT, ATTR_FRIENDLY_NAME, \
     EVENT_HOMEASSISTANT_START, ATTR_ICON
@@ -37,9 +34,6 @@ VALID_CONFIG = {
 }
 
 
-# Until https://github.com/kurtmckee/feedparser/pull/131 is released.
-@pytest.mark.skipif(sys.version_info[:2] >= (3, 7),
-                    reason='Package incompatible with Python 3.7')
 class TestGeoRssServiceUpdater(unittest.TestCase):
     """Test the GeoRss service updater."""
 
diff --git a/tests/components/sensor/test_hddtemp.py b/tests/components/sensor/test_hddtemp.py
index eeca7fcf565..cc2eb361c87 100644
--- a/tests/components/sensor/test_hddtemp.py
+++ b/tests/components/sensor/test_hddtemp.py
@@ -155,7 +155,7 @@ class TestHDDTempSensor(unittest.TestCase):
         """Test hddtemp one disk configuration."""
         assert setup_component(self.hass, 'sensor', VALID_CONFIG_ONE_DISK)
 
-        state = self.hass.states.get('sensor.hd_temperature_devsdd1')
+        state = self.hass.states.get('sensor.hd_temperature_dev_sdd1')
 
         reference = self.reference[state.attributes.get('device')]
 
@@ -173,7 +173,7 @@ class TestHDDTempSensor(unittest.TestCase):
         assert setup_component(self.hass, 'sensor', VALID_CONFIG_WRONG_DISK)
 
         assert len(self.hass.states.all()) == 1
-        state = self.hass.states.get('sensor.hd_temperature_devsdx1')
+        state = self.hass.states.get('sensor.hd_temperature_dev_sdx1')
         assert state.attributes.get('friendly_name') == \
             'HD Temperature ' + '/dev/sdx1'
 
@@ -183,9 +183,9 @@ class TestHDDTempSensor(unittest.TestCase):
         assert setup_component(self.hass,
                                'sensor', VALID_CONFIG_MULTIPLE_DISKS)
 
-        for sensor in ['sensor.hd_temperature_devsda1',
-                       'sensor.hd_temperature_devsdb1',
-                       'sensor.hd_temperature_devsdc1']:
+        for sensor in ['sensor.hd_temperature_dev_sda1',
+                       'sensor.hd_temperature_dev_sdb1',
+                       'sensor.hd_temperature_dev_sdc1']:
 
             state = self.hass.states.get(sensor)
 
diff --git a/tests/components/sensor/test_islamic_prayer_times.py b/tests/components/sensor/test_islamic_prayer_times.py
new file mode 100644
index 00000000000..2c132ac5a8f
--- /dev/null
+++ b/tests/components/sensor/test_islamic_prayer_times.py
@@ -0,0 +1,164 @@
+"""The tests for the Islamic prayer times sensor platform."""
+from datetime import datetime, timedelta
+from unittest.mock import patch
+from homeassistant.setup import async_setup_component
+from homeassistant.components.sensor.islamic_prayer_times import \
+    IslamicPrayerTimesData
+from tests.common import MockDependency
+import homeassistant.util.dt as dt_util
+from tests.common import async_fire_time_changed
+
+LATITUDE = 41
+LONGITUDE = -87
+CALC_METHOD = 'isna'
+PRAYER_TIMES = {"Fajr": "06:10", "Sunrise": "07:25", "Dhuhr": "12:30",
+                "Asr": "15:32", "Maghrib": "17:35", "Isha": "18:53",
+                "Midnight": "00:45"}
+ENTITY_ID_FORMAT = 'sensor.islamic_prayer_time_{}'
+
+
+def get_prayer_time_as_dt(prayer_time):
+    """Create a datetime object for the respective prayer time."""
+    today = datetime.today().strftime('%Y-%m-%d')
+    date_time_str = '{} {}'.format(str(today), prayer_time)
+    pt_dt = dt_util.parse_datetime(date_time_str)
+    return pt_dt
+
+
+async def test_islamic_prayer_times_min_config(hass):
+    """Test minimum Islamic prayer times configuration."""
+    min_config_sensors = ['fajr', 'dhuhr', 'asr', 'maghrib', 'isha']
+
+    with MockDependency('prayer_times_calculator') as mock_pt_calc:
+        mock_pt_calc.PrayerTimesCalculator.return_value.fetch_prayer_times \
+            .return_value = PRAYER_TIMES
+
+        config = {
+            'sensor': {
+                'platform': 'islamic_prayer_times'
+            }
+        }
+        assert await async_setup_component(hass, 'sensor', config) is True
+
+        for sensor in min_config_sensors:
+            entity_id = ENTITY_ID_FORMAT.format(sensor)
+            entity_id_name = sensor.capitalize()
+            pt_dt = get_prayer_time_as_dt(PRAYER_TIMES[entity_id_name])
+            state = hass.states.get(entity_id)
+            assert state.state == pt_dt.isoformat()
+            assert state.name == entity_id_name
+
+
+async def test_islamic_prayer_times_multiple_sensors(hass):
+    """Test Islamic prayer times sensor with multiple sensors setup."""
+    multiple_sensors = ['fajr', 'sunrise', 'dhuhr', 'asr', 'maghrib', 'isha',
+                        'midnight']
+
+    with MockDependency('prayer_times_calculator') as mock_pt_calc:
+        mock_pt_calc.PrayerTimesCalculator.return_value.fetch_prayer_times \
+            .return_value = PRAYER_TIMES
+
+        config = {
+            'sensor': {
+                'platform': 'islamic_prayer_times',
+                'sensors': multiple_sensors
+            }
+        }
+
+        assert await async_setup_component(hass, 'sensor', config) is True
+
+        for sensor in multiple_sensors:
+            entity_id = ENTITY_ID_FORMAT.format(sensor)
+            entity_id_name = sensor.capitalize()
+            pt_dt = get_prayer_time_as_dt(PRAYER_TIMES[entity_id_name])
+            state = hass.states.get(entity_id)
+            assert state.state == pt_dt.isoformat()
+            assert state.name == entity_id_name
+
+
+async def test_islamic_prayer_times_with_calculation_method(hass):
+    """Test Islamic prayer times configuration with calculation method."""
+    sensors = ['fajr', 'maghrib']
+
+    with MockDependency('prayer_times_calculator') as mock_pt_calc:
+        mock_pt_calc.PrayerTimesCalculator.return_value.fetch_prayer_times \
+            .return_value = PRAYER_TIMES
+
+        config = {
+            'sensor': {
+                'platform': 'islamic_prayer_times',
+                'calculation_method': 'mwl',
+                'sensors': sensors
+            }
+        }
+
+        assert await async_setup_component(hass, 'sensor', config) is True
+
+        for sensor in sensors:
+            entity_id = ENTITY_ID_FORMAT.format(sensor)
+            entity_id_name = sensor.capitalize()
+            pt_dt = get_prayer_time_as_dt(PRAYER_TIMES[entity_id_name])
+            state = hass.states.get(entity_id)
+            assert state.state == pt_dt.isoformat()
+            assert state.name == entity_id_name
+
+
+async def test_islamic_prayer_times_data_get_prayer_times(hass):
+    """Test Islamic prayer times data fetcher."""
+    with MockDependency('prayer_times_calculator') as mock_pt_calc:
+        mock_pt_calc.PrayerTimesCalculator.return_value.fetch_prayer_times \
+            .return_value = PRAYER_TIMES
+
+        pt_data = IslamicPrayerTimesData(latitude=LATITUDE,
+                                         longitude=LONGITUDE,
+                                         calc_method=CALC_METHOD)
+
+        assert pt_data.get_new_prayer_times() == PRAYER_TIMES
+        assert pt_data.prayer_times_info == PRAYER_TIMES
+
+
+async def test_islamic_prayer_times_sensor_update(hass):
+    """Test Islamic prayer times sensor update."""
+    new_prayer_times = {"Fajr": "06:10",
+                        "Sunrise": "07:25",
+                        "Dhuhr": "12:30",
+                        "Asr": "15:32",
+                        "Maghrib": "17:45",
+                        "Isha": "18:53",
+                        "Midnight": "00:45"}
+
+    with MockDependency('prayer_times_calculator') as mock_pt_calc:
+        mock_pt_calc.PrayerTimesCalculator.return_value.fetch_prayer_times \
+            .side_effect = [PRAYER_TIMES, new_prayer_times]
+
+        config = {
+            'sensor': {
+                'platform': 'islamic_prayer_times',
+                'sensors': ['maghrib']
+            }
+        }
+
+        assert await async_setup_component(hass, 'sensor', config)
+
+        entity_id = 'sensor.islamic_prayer_time_maghrib'
+        pt_dt = get_prayer_time_as_dt(PRAYER_TIMES['Maghrib'])
+        state = hass.states.get(entity_id)
+        assert state.state == pt_dt.isoformat()
+
+        midnight = PRAYER_TIMES['Midnight']
+        now = dt_util.as_local(dt_util.now())
+        today = now.date()
+
+        midnight_dt_str = '{}::{}'.format(str(today), midnight)
+        midnight_dt = datetime.strptime(midnight_dt_str, '%Y-%m-%d::%H:%M')
+        future = midnight_dt + timedelta(days=1, minutes=1)
+
+        with patch(
+                'homeassistant.components.sensor.islamic_prayer_times'
+                '.dt_util.utcnow', return_value=future):
+
+            async_fire_time_changed(hass, future)
+            await hass.async_block_till_done()
+            state = hass.states.get(entity_id)
+            pt_dt = get_prayer_time_as_dt(new_prayer_times['Maghrib'])
+            assert state.state == pt_dt.isoformat()
diff --git a/tests/components/sensor/test_london_underground.py b/tests/components/sensor/test_london_underground.py
deleted file mode 100644
index 7acd61f6440..00000000000
--- a/tests/components/sensor/test_london_underground.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""The tests for the tube_state platform."""
-import unittest
-import requests_mock
-
-from homeassistant.components.sensor.london_underground import CONF_LINE, URL
-from homeassistant.setup import setup_component
-from tests.common import load_fixture, get_test_home_assistant
-
-VALID_CONFIG = {
-    'platform': 'london_underground',
-    CONF_LINE: [
-        'London Overground',
-    ]
-}
-
-
-class TestLondonTubeSensor(unittest.TestCase):
-    """Test the tube_state platform."""
-
-    def setUp(self):
-        """Initialize values for this testcase class."""
-        self.hass = get_test_home_assistant()
-        self.config = VALID_CONFIG
-
-    def tearDown(self):
-        """Stop everything that was started."""
-        self.hass.stop()
-
-    @requests_mock.Mocker()
-    def test_setup(self, mock_req):
-        """Test for operational tube_state sensor with proper attributes."""
-        mock_req.get(URL, text=load_fixture('london_underground.json'))
-        assert setup_component(self.hass, 'sensor', {'sensor': self.config})
-
-        state = self.hass.states.get('sensor.london_overground')
-        assert state.state == 'Minor Delays'
-        assert state.attributes.get('Description') == 'something'
diff --git a/tests/components/sensor/test_mqtt.py b/tests/components/sensor/test_mqtt.py
index 78de05e1ff3..79ba2c7a512 100644
--- a/tests/components/sensor/test_mqtt.py
+++ b/tests/components/sensor/test_mqtt.py
@@ -3,7 +3,7 @@ import json
 import unittest
 
 from datetime import timedelta, datetime
-from unittest.mock import patch
+from unittest.mock import ANY, patch
 
 import homeassistant.core as ha
 from homeassistant.setup import setup_component, async_setup_component
@@ -15,7 +15,7 @@ import homeassistant.util.dt as dt_util
 
 from tests.common import mock_mqtt_component, fire_mqtt_message, \
     assert_setup_component, async_fire_mqtt_message, \
-    async_mock_mqtt_component, MockConfigEntry
+    async_mock_mqtt_component, MockConfigEntry, mock_registry
 from tests.common import get_test_home_assistant, mock_component
 
 
@@ -333,6 +333,67 @@ class TestSensorMQTT(unittest.TestCase):
             state.attributes.get('val')
         assert '100' == state.state
 
+    def test_setting_sensor_attribute_via_mqtt_json_topic(self):
+        """Test the setting of attribute via MQTT with JSON payload."""
+        mock_component(self.hass, 'mqtt')
+        assert setup_component(self.hass, sensor.DOMAIN, {
+            sensor.DOMAIN: {
+                'platform': 'mqtt',
+                'name': 'test',
+                'state_topic': 'test-topic',
+                'json_attributes_topic': 'attr-topic'
+            }
+        })
+
+        fire_mqtt_message(self.hass, 'attr-topic', '{ "val": "100" }')
+        self.hass.block_till_done()
+        state = self.hass.states.get('sensor.test')
+
+        assert '100' == \
+            state.attributes.get('val')
+
+    @patch('homeassistant.components.mqtt._LOGGER')
+    def test_update_with_json_attrs_topic_not_dict(self, mock_logger):
+        """Test attributes get extracted from a JSON result."""
+        mock_component(self.hass, 'mqtt')
+        assert setup_component(self.hass, sensor.DOMAIN, {
+            sensor.DOMAIN: {
+                'platform': 'mqtt',
+                'name': 'test',
+                'state_topic': 'test-topic',
+                'json_attributes_topic': 'attr-topic'
+            }
+        })
+
+        fire_mqtt_message(self.hass, 'attr-topic', '[ "list", "of", "things"]')
+        self.hass.block_till_done()
+        state = self.hass.states.get('sensor.test')
+
+        assert state.attributes.get('val') is None
+        mock_logger.warning.assert_called_with(
+            'JSON result was not a dictionary')
+
+    @patch('homeassistant.components.mqtt._LOGGER')
+    def test_update_with_json_attrs_topic_bad_JSON(self, mock_logger):
+        """Test attributes get extracted from a JSON result."""
+        mock_component(self.hass, 'mqtt')
+        assert setup_component(self.hass, sensor.DOMAIN, {
+            sensor.DOMAIN: {
+                'platform': 'mqtt',
+                'name': 'test',
+                'state_topic': 'test-topic',
+                'json_attributes_topic': 'attr-topic'
+            }
+        })
+
+        fire_mqtt_message(self.hass, 'attr-topic', 'This is not JSON')
+        self.hass.block_till_done()
+
+        state = self.hass.states.get('sensor.test')
+        assert state.attributes.get('val') is None
+        mock_logger.warning.assert_called_with(
+            'Erroneous JSON: %s', 'This is not JSON')
+
     def test_invalid_device_class(self):
         """Test device_class option with invalid value."""
         with assert_setup_component(0):
@@ -481,3 +542,38 @@ async def test_entity_device_info_with_identifier(hass, mqtt_mock):
     assert device.name == 'Beer'
     assert device.model == 'Glass'
     assert device.sw_version == '0.1-beta'
+
+
+async def test_entity_id_update(hass, mqtt_mock):
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    registry = mock_registry(hass, {})
+    mock_mqtt = await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, sensor.DOMAIN, {
+        sensor.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'beer',
+            'state_topic': 'test-topic',
+            'availability_topic': 'avty-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+
+    state = hass.states.get('sensor.beer')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.reset_mock()
+
+    registry.async_update_entity('sensor.beer', new_entity_id='sensor.milk')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    state = hass.states.get('sensor.beer')
+    assert state is None
+
+    state = hass.states.get('sensor.milk')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
diff --git a/tests/components/sensor/test_openhardwaremonitor.py b/tests/components/sensor/test_openhardwaremonitor.py
index 5117f87cd70..089e5e85a08 100644
--- a/tests/components/sensor/test_openhardwaremonitor.py
+++ b/tests/components/sensor/test_openhardwaremonitor.py
@@ -34,7 +34,7 @@ class TestOpenHardwareMonitorSetup(unittest.TestCase):
         assert len(entities) == 38
 
         state = self.hass.states.get(
-            'sensor.testpc_intel_core_i77700_clocks_bus_speed')
+            'sensor.test_pc_intel_core_i7_7700_clocks_bus_speed')
 
         assert state is not None
         assert state.state == '100'
diff --git a/tests/components/sensor/test_rflink.py b/tests/components/sensor/test_rflink.py
index a250a75ab99..8ab568905f9 100644
--- a/tests/components/sensor/test_rflink.py
+++ b/tests/components/sensor/test_rflink.py
@@ -5,12 +5,11 @@ automatic sensor creation.
 
 """
 
-import asyncio
-
-from ..test_rflink import mock_rflink
 from homeassistant.components.rflink import (
-    CONF_RECONNECT_INTERVAL)
+    CONF_RECONNECT_INTERVAL, TMP_ENTITY, DATA_ENTITY_LOOKUP,
+    EVENT_KEY_COMMAND, EVENT_KEY_SENSOR)
 from homeassistant.const import STATE_UNKNOWN
+from ..test_rflink import mock_rflink
 
 DOMAIN = 'sensor'
 
@@ -31,11 +30,10 @@ CONFIG = {
 }
 
 
-@asyncio.coroutine
-def test_default_setup(hass, monkeypatch):
+async def test_default_setup(hass, monkeypatch):
     """Test all basic functionality of the rflink sensor component."""
     # setup mocking rflink module
-    event_callback, create, _, disconnect_callback = yield from mock_rflink(
+    event_callback, create, _, _ = await mock_rflink(
         hass, CONFIG, DOMAIN, monkeypatch)
 
     # make sure arguments are passed
@@ -54,7 +52,7 @@ def test_default_setup(hass, monkeypatch):
         'value': 1,
         'unit': '°C',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert hass.states.get('sensor.test').state == '1'
 
@@ -65,7 +63,7 @@ def test_default_setup(hass, monkeypatch):
         'value': 0,
         'unit': '°C',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     # test  state of new sensor
     new_sensor = hass.states.get('sensor.test2')
@@ -75,8 +73,7 @@ def test_default_setup(hass, monkeypatch):
     assert new_sensor.attributes['icon'] == 'mdi:thermometer'
 
 
-@asyncio.coroutine
-def test_disable_automatic_add(hass, monkeypatch):
+async def test_disable_automatic_add(hass, monkeypatch):
     """If disabled new devices should not be automatically added."""
     config = {
         'rflink': {
@@ -89,7 +86,7 @@ def test_disable_automatic_add(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    event_callback, _, _, _ = yield from mock_rflink(
+    event_callback, _, _, _ = await mock_rflink(
         hass, config, DOMAIN, monkeypatch)
 
     # test event for new unconfigured sensor
@@ -99,14 +96,13 @@ def test_disable_automatic_add(hass, monkeypatch):
         'value': 0,
         'unit': '°C',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     # make sure new device is not added
     assert not hass.states.get('sensor.test2')
 
 
-@asyncio.coroutine
-def test_entity_availability(hass, monkeypatch):
+async def test_entity_availability(hass, monkeypatch):
     """If Rflink device is disconnected, entities should become unavailable."""
     # Make sure Rflink mock does not 'recover' to quickly from the
     # disconnect or else the unavailability cannot be measured
@@ -115,7 +111,7 @@ def test_entity_availability(hass, monkeypatch):
     config[CONF_RECONNECT_INTERVAL] = 60
 
     # Create platform and entities
-    event_callback, create, _, disconnect_callback = yield from mock_rflink(
+    _, _, _, disconnect_callback = await mock_rflink(
         hass, config, DOMAIN, monkeypatch, failures=failures)
 
     # Entities are available by default
@@ -125,7 +121,7 @@ def test_entity_availability(hass, monkeypatch):
     disconnect_callback()
 
     # Wait for dispatch events to propagate
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     # Entity should be unavailable
     assert hass.states.get('sensor.test').state == 'unavailable'
@@ -134,7 +130,115 @@ def test_entity_availability(hass, monkeypatch):
     disconnect_callback()
 
     # Wait for dispatch events to propagate
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     # Entities should be available again
     assert hass.states.get('sensor.test').state == STATE_UNKNOWN
+
+
+async def test_aliasses(hass, monkeypatch):
+    """Validate the response to sensor's alias (with aliasses)."""
+    config = {
+        'rflink': {
+            'port': '/dev/ttyABC0',
+        },
+        DOMAIN: {
+            'platform': 'rflink',
+            'devices': {
+                'test_02': {
+                    'name': 'test_02',
+                    'sensor_type': 'humidity',
+                    'aliasses': ['test_alias_02_0'],
+                },
+            },
+        },
+    }
+
+    # setup mocking rflink module
+    event_callback, _, _, _ = await mock_rflink(
+        hass, config, DOMAIN, monkeypatch)
+
+    # test default state of sensor loaded from config
+    config_sensor = hass.states.get('sensor.test_02')
+    assert config_sensor
+    assert config_sensor.state == 'unknown'
+
+    # test event for config sensor
+    event_callback({
+        'id': 'test_alias_02_0',
+        'sensor': 'humidity',
+        'value': 65,
+        'unit': '%',
+    })
+    await hass.async_block_till_done()
+
+    # test  state of new sensor
+    updated_sensor = hass.states.get('sensor.test_02')
+    assert updated_sensor
+    assert updated_sensor.state == '65'
+    assert updated_sensor.attributes['unit_of_measurement'] == '%'
+
+
+async def test_race_condition(hass, monkeypatch):
+    """Test race condition for unknown components."""
+    config = {
+        'rflink': {
+            'port': '/dev/ttyABC0',
+        },
+        DOMAIN: {
+            'platform': 'rflink',
+        },
+    }
+    tmp_entity = TMP_ENTITY.format('test3')
+
+    # setup mocking rflink module
+    event_callback, _, _, _ = await mock_rflink(
+        hass, config, DOMAIN, monkeypatch)
+
+    # test event for new unconfigured sensor
+    event_callback({
+        'id': 'test3',
+        'sensor': 'battery',
+        'value': 'ok',
+        'unit': '',
+    })
+    event_callback({
+        'id': 'test3',
+        'sensor': 'battery',
+        'value': 'ko',
+        'unit': '',
+    })
+
+    # tmp_entity added to EVENT_KEY_SENSOR
+    assert tmp_entity in hass.data[DATA_ENTITY_LOOKUP][
+        EVENT_KEY_SENSOR]['test3']
+    # tmp_entity must no be added to EVENT_KEY_COMMAND
+    assert tmp_entity not in hass.data[DATA_ENTITY_LOOKUP][
+        EVENT_KEY_COMMAND]['test3']
+
+    await hass.async_block_till_done()
+
+    # test  state of new sensor
+    updated_sensor = hass.states.get('sensor.test3')
+    assert updated_sensor
+
+    # test  state of new sensor
+    new_sensor = hass.states.get(DOMAIN+'.test3')
+    assert new_sensor
+    assert new_sensor.state == 'ok'
+
+    event_callback({
+        'id': 'test3',
+        'sensor': 'battery',
+        'value': 'ko',
+        'unit': '',
+    })
+    await hass.async_block_till_done()
+    # tmp_entity must be deleted from EVENT_KEY_COMMAND
+    assert tmp_entity not in hass.data[DATA_ENTITY_LOOKUP][
+        EVENT_KEY_SENSOR]['test3']
+
+    # test  state of new sensor
+    new_sensor = hass.states.get(DOMAIN+'.test3')
+    assert new_sensor
+    assert new_sensor.state == 'ko'
diff --git a/tests/components/sensor/test_startca.py b/tests/components/sensor/test_startca.py
index 95da1c93a0c..eb5ca2203e0 100644
--- a/tests/components/sensor/test_startca.py
+++ b/tests/components/sensor/test_startca.py
@@ -47,51 +47,51 @@ def test_capped_setup(hass, aioclient_mock):
 
     yield from async_setup_component(hass, 'sensor', {'sensor': config})
 
-    state = hass.states.get('sensor.startca_usage_ratio')
+    state = hass.states.get('sensor.start_ca_usage_ratio')
     assert state.attributes.get('unit_of_measurement') == '%'
     assert state.state == '76.24'
 
-    state = hass.states.get('sensor.startca_usage')
+    state = hass.states.get('sensor.start_ca_usage')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '304.95'
 
-    state = hass.states.get('sensor.startca_data_limit')
+    state = hass.states.get('sensor.start_ca_data_limit')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '400'
 
-    state = hass.states.get('sensor.startca_used_download')
+    state = hass.states.get('sensor.start_ca_used_download')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '304.95'
 
-    state = hass.states.get('sensor.startca_used_upload')
+    state = hass.states.get('sensor.start_ca_used_upload')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '6.48'
 
-    state = hass.states.get('sensor.startca_used_total')
+    state = hass.states.get('sensor.start_ca_used_total')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '311.43'
 
-    state = hass.states.get('sensor.startca_grace_download')
+    state = hass.states.get('sensor.start_ca_grace_download')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '304.95'
 
-    state = hass.states.get('sensor.startca_grace_upload')
+    state = hass.states.get('sensor.start_ca_grace_upload')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '6.48'
 
-    state = hass.states.get('sensor.startca_grace_total')
+    state = hass.states.get('sensor.start_ca_grace_total')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '311.43'
 
-    state = hass.states.get('sensor.startca_total_download')
+    state = hass.states.get('sensor.start_ca_total_download')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '304.95'
 
-    state = hass.states.get('sensor.startca_total_upload')
+    state = hass.states.get('sensor.start_ca_total_upload')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '6.48'
 
-    state = hass.states.get('sensor.startca_remaining')
+    state = hass.states.get('sensor.start_ca_remaining')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '95.05'
 
@@ -138,51 +138,51 @@ def test_unlimited_setup(hass, aioclient_mock):
 
     yield from async_setup_component(hass, 'sensor', {'sensor': config})
 
-    state = hass.states.get('sensor.startca_usage_ratio')
+    state = hass.states.get('sensor.start_ca_usage_ratio')
     assert state.attributes.get('unit_of_measurement') == '%'
     assert state.state == '0'
 
-    state = hass.states.get('sensor.startca_usage')
+    state = hass.states.get('sensor.start_ca_usage')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '0.0'
 
-    state = hass.states.get('sensor.startca_data_limit')
+    state = hass.states.get('sensor.start_ca_data_limit')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == 'inf'
 
-    state = hass.states.get('sensor.startca_used_download')
+    state = hass.states.get('sensor.start_ca_used_download')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '0.0'
 
-    state = hass.states.get('sensor.startca_used_upload')
+    state = hass.states.get('sensor.start_ca_used_upload')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '0.0'
 
-    state = hass.states.get('sensor.startca_used_total')
+    state = hass.states.get('sensor.start_ca_used_total')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '0.0'
 
-    state = hass.states.get('sensor.startca_grace_download')
+    state = hass.states.get('sensor.start_ca_grace_download')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '304.95'
 
-    state = hass.states.get('sensor.startca_grace_upload')
+    state = hass.states.get('sensor.start_ca_grace_upload')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '6.48'
 
-    state = hass.states.get('sensor.startca_grace_total')
+    state = hass.states.get('sensor.start_ca_grace_total')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '311.43'
 
-    state = hass.states.get('sensor.startca_total_download')
+    state = hass.states.get('sensor.start_ca_total_download')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '304.95'
 
-    state = hass.states.get('sensor.startca_total_upload')
+    state = hass.states.get('sensor.start_ca_total_upload')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == '6.48'
 
-    state = hass.states.get('sensor.startca_remaining')
+    state = hass.states.get('sensor.start_ca_remaining')
     assert state.attributes.get('unit_of_measurement') == 'GB'
     assert state.state == 'inf'
 
diff --git a/tests/components/switch/test_mqtt.py b/tests/components/switch/test_mqtt.py
index a37572cc992..cbacc9d5335 100644
--- a/tests/components/switch/test_mqtt.py
+++ b/tests/components/switch/test_mqtt.py
@@ -2,6 +2,7 @@
 import json
 from asynctest import patch
 import pytest
+from unittest.mock import ANY
 
 from homeassistant.setup import async_setup_component
 from homeassistant.const import STATE_ON, STATE_OFF, STATE_UNAVAILABLE,\
@@ -12,7 +13,7 @@ from homeassistant.components.mqtt.discovery import async_start
 
 from tests.common import (
     mock_coro, async_mock_mqtt_component, async_fire_mqtt_message,
-    MockConfigEntry)
+    MockConfigEntry, mock_registry)
 from tests.components.switch import common
 
 
@@ -434,3 +435,39 @@ async def test_entity_device_info_with_identifier(hass, mqtt_mock):
     assert device.name == 'Beer'
     assert device.model == 'Glass'
     assert device.sw_version == '0.1-beta'
+
+
+async def test_entity_id_update(hass, mqtt_mock):
+    """Test MQTT subscriptions are managed when entity_id is updated."""
+    registry = mock_registry(hass, {})
+    mock_mqtt = await async_mock_mqtt_component(hass)
+    assert await async_setup_component(hass, switch.DOMAIN, {
+        switch.DOMAIN: [{
+            'platform': 'mqtt',
+            'name': 'beer',
+            'state_topic': 'test-topic',
+            'command_topic': 'command-topic',
+            'availability_topic': 'avty-topic',
+            'unique_id': 'TOTALLY_UNIQUE'
+        }]
+    })
+
+    state = hass.states.get('switch.beer')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.reset_mock()
+
+    registry.async_update_entity('switch.beer', new_entity_id='switch.milk')
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
+
+    state = hass.states.get('switch.beer')
+    assert state is None
+
+    state = hass.states.get('switch.milk')
+    assert state is not None
+    assert mock_mqtt.async_subscribe.call_count == 2
+    mock_mqtt.async_subscribe.assert_any_call('test-topic', ANY, 0, 'utf-8')
+    mock_mqtt.async_subscribe.assert_any_call('avty-topic', ANY, 0, 'utf-8')
diff --git a/tests/components/switch/test_rflink.py b/tests/components/switch/test_rflink.py
index 77a6b572e96..b50a223fe8b 100644
--- a/tests/components/switch/test_rflink.py
+++ b/tests/components/switch/test_rflink.py
@@ -5,13 +5,12 @@ control of Rflink switch devices.
 
 """
 
-import asyncio
-
 from homeassistant.components.rflink import EVENT_BUTTON_PRESSED
 from homeassistant.const import (
-    ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON)
-from homeassistant.core import callback
+    ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_TURN_ON, STATE_ON, STATE_OFF)
+from homeassistant.core import callback, State, CoreState
 
+from tests.common import mock_restore_cache
 from ..test_rflink import mock_rflink
 
 DOMAIN = 'switch'
@@ -33,11 +32,10 @@ CONFIG = {
 }
 
 
-@asyncio.coroutine
-def test_default_setup(hass, monkeypatch):
+async def test_default_setup(hass, monkeypatch):
     """Test all basic functionality of the rflink switch component."""
     # setup mocking rflink module
-    event_callback, create, protocol, _ = yield from mock_rflink(
+    event_callback, create, protocol, _ = await mock_rflink(
         hass, CONFIG, DOMAIN, monkeypatch)
 
     # make sure arguments are passed
@@ -56,7 +54,7 @@ def test_default_setup(hass, monkeypatch):
         'id': 'protocol_0_0',
         'command': 'on',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     switch_after_first_command = hass.states.get('switch.test')
     assert switch_after_first_command.state == 'on'
@@ -68,7 +66,7 @@ def test_default_setup(hass, monkeypatch):
         'id': 'protocol_0_0',
         'command': 'off',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert hass.states.get('switch.test').state == 'off'
 
@@ -78,7 +76,7 @@ def test_default_setup(hass, monkeypatch):
         'id': 'test_alias_0_0',
         'command': 'on',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert hass.states.get('switch.test').state == 'on'
 
@@ -86,24 +84,23 @@ def test_default_setup(hass, monkeypatch):
     # events because every new unknown device is added as a light by default.
 
     # test changing state from HA propagates to Rflink
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(DOMAIN, SERVICE_TURN_OFF,
                                  {ATTR_ENTITY_ID: DOMAIN + '.test'}))
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
     assert hass.states.get(DOMAIN + '.test').state == 'off'
     assert protocol.send_command_ack.call_args_list[0][0][0] == 'protocol_0_0'
     assert protocol.send_command_ack.call_args_list[0][0][1] == 'off'
 
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(DOMAIN, SERVICE_TURN_ON,
                                  {ATTR_ENTITY_ID: DOMAIN + '.test'}))
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
     assert hass.states.get(DOMAIN + '.test').state == 'on'
     assert protocol.send_command_ack.call_args_list[1][0][1] == 'on'
 
 
-@asyncio.coroutine
-def test_group_alias(hass, monkeypatch):
+async def test_group_alias(hass, monkeypatch):
     """Group aliases should only respond to group commands (allon/alloff)."""
     config = {
         'rflink': {
@@ -121,7 +118,7 @@ def test_group_alias(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    event_callback, _, _, _ = yield from mock_rflink(
+    event_callback, _, _, _ = await mock_rflink(
         hass, config, DOMAIN, monkeypatch)
 
     assert hass.states.get(DOMAIN + '.test').state == 'off'
@@ -131,7 +128,7 @@ def test_group_alias(hass, monkeypatch):
         'id': 'test_group_0_0',
         'command': 'allon',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert hass.states.get(DOMAIN + '.test').state == 'on'
 
@@ -140,13 +137,12 @@ def test_group_alias(hass, monkeypatch):
         'id': 'test_group_0_0',
         'command': 'off',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert hass.states.get(DOMAIN + '.test').state == 'on'
 
 
-@asyncio.coroutine
-def test_nogroup_alias(hass, monkeypatch):
+async def test_nogroup_alias(hass, monkeypatch):
     """Non group aliases should not respond to group commands."""
     config = {
         'rflink': {
@@ -164,7 +160,7 @@ def test_nogroup_alias(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    event_callback, _, _, _ = yield from mock_rflink(
+    event_callback, _, _, _ = await mock_rflink(
         hass, config, DOMAIN, monkeypatch)
 
     assert hass.states.get(DOMAIN + '.test').state == 'off'
@@ -174,7 +170,7 @@ def test_nogroup_alias(hass, monkeypatch):
         'id': 'test_nogroup_0_0',
         'command': 'allon',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
     # should not affect state
     assert hass.states.get(DOMAIN + '.test').state == 'off'
 
@@ -183,13 +179,12 @@ def test_nogroup_alias(hass, monkeypatch):
         'id': 'test_nogroup_0_0',
         'command': 'on',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
     # should affect state
     assert hass.states.get(DOMAIN + '.test').state == 'on'
 
 
-@asyncio.coroutine
-def test_nogroup_device_id(hass, monkeypatch):
+async def test_nogroup_device_id(hass, monkeypatch):
     """Device id that do not respond to group commands (allon/alloff)."""
     config = {
         'rflink': {
@@ -207,7 +202,7 @@ def test_nogroup_device_id(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    event_callback, _, _, _ = yield from mock_rflink(
+    event_callback, _, _, _ = await mock_rflink(
         hass, config, DOMAIN, monkeypatch)
 
     assert hass.states.get(DOMAIN + '.test').state == 'off'
@@ -217,7 +212,7 @@ def test_nogroup_device_id(hass, monkeypatch):
         'id': 'test_nogroup_0_0',
         'command': 'allon',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
     # should not affect state
     assert hass.states.get(DOMAIN + '.test').state == 'off'
 
@@ -226,13 +221,12 @@ def test_nogroup_device_id(hass, monkeypatch):
         'id': 'test_nogroup_0_0',
         'command': 'on',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
     # should affect state
     assert hass.states.get(DOMAIN + '.test').state == 'on'
 
 
-@asyncio.coroutine
-def test_device_defaults(hass, monkeypatch):
+async def test_device_defaults(hass, monkeypatch):
     """Event should fire if device_defaults config says so."""
     config = {
         'rflink': {
@@ -253,7 +247,7 @@ def test_device_defaults(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    event_callback, _, _, _ = yield from mock_rflink(
+    event_callback, _, _, _ = await mock_rflink(
         hass, config, DOMAIN, monkeypatch)
 
     calls = []
@@ -268,13 +262,12 @@ def test_device_defaults(hass, monkeypatch):
         'id': 'protocol_0_0',
         'command': 'off',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert calls[0].data == {'state': 'off', 'entity_id': DOMAIN + '.test'}
 
 
-@asyncio.coroutine
-def test_not_firing_default(hass, monkeypatch):
+async def test_not_firing_default(hass, monkeypatch):
     """By default no bus events should be fired."""
     config = {
         'rflink': {
@@ -292,7 +285,7 @@ def test_not_firing_default(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    event_callback, _, _, _ = yield from mock_rflink(
+    event_callback, _, _, _ = await mock_rflink(
         hass, config, DOMAIN, monkeypatch)
 
     calls = []
@@ -307,6 +300,54 @@ def test_not_firing_default(hass, monkeypatch):
         'id': 'protocol_0_0',
         'command': 'off',
     })
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     assert not calls, 'an event has been fired'
+
+
+async def test_restore_state(hass, monkeypatch):
+    """Ensure states are restored on startup."""
+    config = {
+        'rflink': {
+            'port': '/dev/ttyABC0',
+        },
+        DOMAIN: {
+            'platform': 'rflink',
+            'devices': {
+                'test': {
+                    'name': 's1',
+                    'aliases': ['test_alias_0_0'],
+                },
+                'switch_test': {
+                    'name': 's2',
+                },
+                'switch_s3': {
+                    'name': 's3',
+                }
+            }
+        }
+    }
+
+    mock_restore_cache(hass, (
+        State(DOMAIN + '.s1', STATE_ON, ),
+        State(DOMAIN + '.s2', STATE_OFF, ),
+    ))
+
+    hass.state = CoreState.starting
+
+    # setup mocking rflink module
+    _, _, _, _ = await mock_rflink(hass, config, DOMAIN, monkeypatch)
+
+    state = hass.states.get(DOMAIN + '.s1')
+    assert state
+    assert state.state == STATE_ON
+
+    state = hass.states.get(DOMAIN + '.s2')
+    assert state
+    assert state.state == STATE_OFF
+
+    # not cached switch must default values
+    state = hass.states.get(DOMAIN + '.s3')
+    assert state
+    assert state.state == STATE_OFF
+    assert state.attributes['assumed_state']
diff --git a/tests/components/tellduslive/__init__.py b/tests/components/tellduslive/__init__.py
new file mode 100644
index 00000000000..4ed4babc1c8
--- /dev/null
+++ b/tests/components/tellduslive/__init__.py
@@ -0,0 +1 @@
+"""Tests for the TelldusLive component."""
diff --git a/tests/components/tellduslive/test_config_flow.py b/tests/components/tellduslive/test_config_flow.py
new file mode 100644
index 00000000000..ba569a9f149
--- /dev/null
+++ b/tests/components/tellduslive/test_config_flow.py
@@ -0,0 +1,223 @@
+# flake8: noqa pylint: skip-file
+"""Tests for the TelldusLive config flow."""
+import asyncio
+from unittest.mock import Mock, patch
+
+import pytest
+
+from homeassistant import data_entry_flow
+from homeassistant.components.tellduslive import (
+    APPLICATION_NAME, DOMAIN, KEY_HOST, KEY_SCAN_INTERVAL, SCAN_INTERVAL,
+    config_flow)
+
+from tests.common import MockConfigEntry, MockDependency, mock_coro
+
+
+def init_config_flow(hass, side_effect=None):
+    """Init a configuration flow."""
+    flow = config_flow.FlowHandler()
+    flow.hass = hass
+    if side_effect:
+        flow._get_auth_url = Mock(side_effect=side_effect)
+    return flow
+
+
+@pytest.fixture
+def supports_local_api():
+    """Set TelldusLive supports_local_api."""
+    return True
+
+
+@pytest.fixture
+def authorize():
+    """Set TelldusLive authorize."""
+    return True
+
+
+@pytest.fixture
+def mock_tellduslive(supports_local_api, authorize):
+    """Mock tellduslive."""
+    with MockDependency('tellduslive') as mock_tellduslive_:
+        mock_tellduslive_.supports_local_api.return_value = supports_local_api
+        mock_tellduslive_.Session().authorize.return_value = authorize
+        mock_tellduslive_.Session().access_token = 'token'
+        mock_tellduslive_.Session().access_token_secret = 'token_secret'
+        mock_tellduslive_.Session().authorize_url = 'https://example.com'
+        yield mock_tellduslive_
+
+
+async def test_abort_if_already_setup(hass):
+    """Test we abort if TelldusLive is already setup."""
+    flow = init_config_flow(hass)
+
+    with patch.object(hass.config_entries, 'async_entries', return_value=[{}]):
+        result = await flow.async_step_user()
+    assert result['type'] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result['reason'] == 'already_setup'
+
+    with patch.object(hass.config_entries, 'async_entries', return_value=[{}]):
+        result = await flow.async_step_import(None)
+    assert result['type'] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result['reason'] == 'already_setup'
+
+
+async def test_full_flow_implementation(hass, mock_tellduslive):
+    """Test registering an implementation and finishing flow works."""
+    flow = init_config_flow(hass)
+    result = await flow.async_step_discovery(['localhost', 'tellstick'])
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['step_id'] == 'user'
+
+    result = await flow.async_step_user()
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['step_id'] == 'user'
+
+    result = await flow.async_step_user({'host': 'localhost'})
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['step_id'] == 'auth'
+    assert result['description_placeholders'] == {
+        'auth_url': 'https://example.com',
+        'app_name': APPLICATION_NAME,
+    }
+
+    result = await flow.async_step_auth('')
+    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result['title'] == 'localhost'
+    assert result['data']['host'] == 'localhost'
+    assert result['data']['scan_interval'] == 60
+    assert result['data']['session'] == {'token': 'token', 'host': 'localhost'}
+
+
+async def test_step_import(hass, mock_tellduslive):
+    """Test that we trigger auth when configuring from import."""
+    flow = init_config_flow(hass)
+
+    result = await flow.async_step_import({
+        KEY_HOST: DOMAIN,
+        KEY_SCAN_INTERVAL: 0,
+    })
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['step_id'] == 'auth'
+
+
+async def test_step_import_add_host(hass, mock_tellduslive):
+    """Test that we add host and trigger user when configuring from import."""
+    flow = init_config_flow(hass)
+
+    result = await flow.async_step_import({
+        KEY_HOST: 'localhost',
+        KEY_SCAN_INTERVAL: 0,
+    })
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['step_id'] == 'user'
+
+
+async def test_step_import_no_config_file(hass, mock_tellduslive):
+    """Test that we trigger user with no config_file configuring from import."""
+    flow = init_config_flow(hass)
+
+    result = await flow.async_step_import({ KEY_HOST: 'localhost', KEY_SCAN_INTERVAL: 0, })
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['step_id'] == 'user'
+
+
+async def test_step_import_load_json_matching_host(hass, mock_tellduslive):
+    """Test that we add host and trigger user when configuring from import."""
+    flow = init_config_flow(hass)
+
+    with patch('homeassistant.components.tellduslive.config_flow.load_json',
+               return_value={'tellduslive': {}}), \
+            patch('os.path.isfile'):
+        result = await flow.async_step_import({ KEY_HOST: 'Cloud API', KEY_SCAN_INTERVAL: 0, })
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['step_id'] == 'user'
+
+
+async def test_step_import_load_json(hass, mock_tellduslive):
+    """Test that we create entry when configuring from import."""
+    flow = init_config_flow(hass)
+
+    with patch('homeassistant.components.tellduslive.config_flow.load_json',
+               return_value={'localhost': {}}), \
+            patch('os.path.isfile'):
+        result = await flow.async_step_import({ KEY_HOST: 'localhost', KEY_SCAN_INTERVAL: SCAN_INTERVAL, })
+    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result['title'] == 'localhost'
+    assert result['data']['host'] == 'localhost'
+    assert result['data']['scan_interval'] == 60
+    assert result['data']['session'] == {}
+
+
+@pytest.mark.parametrize('supports_local_api', [False])
+async def test_step_disco_no_local_api(hass, mock_tellduslive):
+    """Test that we trigger when configuring from discovery, not supporting local api."""
+    flow = init_config_flow(hass)
+
+    result = await flow.async_step_discovery(['localhost', 'tellstick'])
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['step_id'] == 'auth'
+
+
+async def test_step_auth(hass, mock_tellduslive):
+    """Test that create cloud entity from auth."""
+    flow = init_config_flow(hass)
+
+    result = await flow.async_step_auth(['localhost', 'tellstick'])
+    assert result['type'] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result['title'] == 'Cloud API'
+    assert result['data']['host'] == 'Cloud API'
+    assert result['data']['scan_interval'] == 60
+    assert result['data']['session'] == {
+        'token': 'token',
+        'token_secret': 'token_secret',
+    }
+
+
+@pytest.mark.parametrize('authorize', [False])
+async def test_wrong_auth_flow_implementation(hass, mock_tellduslive):
+    """Test wrong auth."""
+    flow = init_config_flow(hass)
+
+    await flow.async_step_user()
+    result = await flow.async_step_auth('')
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['step_id'] == 'auth'
+
+
+async def test_not_pick_host_if_only_one(hass, mock_tellduslive):
+    """Test not picking host if we have just one."""
+    flow = init_config_flow(hass)
+
+    result = await flow.async_step_user()
+    assert result['type'] == data_entry_flow.RESULT_TYPE_FORM
+    assert result['step_id'] == 'auth'
+
+
+async def test_abort_if_timeout_generating_auth_url(hass, mock_tellduslive):
+    """Test abort if generating authorize url timeout."""
+    flow = init_config_flow(hass, side_effect=asyncio.TimeoutError)
+
+    result = await flow.async_step_user()
+    assert result['type'] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result['reason'] == 'authorize_url_timeout'
+
+
+async def test_abort_if_exception_generating_auth_url(hass, mock_tellduslive):
+    """Test we abort if generating authorize url blows up."""
+    flow = init_config_flow(hass, side_effect=ValueError)
+
+    result = await flow.async_step_user()
+    assert result['type'] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result['reason'] == 'authorize_url_fail'
+
+async def test_discovery_already_configured(hass, mock_tellduslive):
+    """Test abort if alredy configured fires from discovery."""
+    MockConfigEntry(
+        domain='tellduslive',
+        data={'host': 'some-host'}
+    ).add_to_hass(hass)
+    flow = init_config_flow(hass)
+
+    result = await flow.async_step_discovery(['some-host', ''])
+    assert result['type'] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result['reason'] == 'already_configured'
diff --git a/tests/components/test_huawei_lte.py b/tests/components/test_huawei_lte.py
index 0fe803208ff..aa3e94e93bf 100644
--- a/tests/components/test_huawei_lte.py
+++ b/tests/components/test_huawei_lte.py
@@ -1,4 +1,6 @@
 """Huawei LTE component tests."""
+from unittest.mock import Mock
+
 import pytest
 
 from homeassistant.components import huawei_lte
@@ -7,7 +9,7 @@ from homeassistant.components import huawei_lte
 @pytest.fixture(autouse=True)
 def routerdata():
     """Set up a router data for testing."""
-    rd = huawei_lte.RouterData(None)
+    rd = huawei_lte.RouterData(Mock())
     rd.device_information = {
         'SoftwareVersion': '1.0',
         'nested': {'foo': 'bar'},
diff --git a/tests/components/test_mythicbeastsdns.py b/tests/components/test_mythicbeastsdns.py
new file mode 100644
index 00000000000..ab801e6e6e5
--- /dev/null
+++ b/tests/components/test_mythicbeastsdns.py
@@ -0,0 +1,70 @@
+"""Test the Mythic Beasts DNS component."""
+import logging
+import asynctest
+
+from homeassistant.setup import async_setup_component
+from homeassistant.components import mythicbeastsdns
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def mbddns_update_mock(domain, password, host, ttl=60, session=None):
+    """Mock out mythic beasts updater."""
+    if password == 'incorrect':
+        _LOGGER.error("Updating Mythic Beasts failed: Not authenticated")
+        return False
+    if host[0] == '$':
+        _LOGGER.error("Updating Mythic Beasts failed: Invalid Character")
+        return False
+    return True
+
+
+@asynctest.mock.patch('mbddns.update', new=mbddns_update_mock)
+async def test_update(hass):
+    """Run with correct values and check true is returned."""
+    result = await async_setup_component(
+        hass,
+        mythicbeastsdns.DOMAIN,
+        {
+            mythicbeastsdns.DOMAIN: {
+                'domain': 'example.org',
+                'password': 'correct',
+                'host': 'hass'
+            }
+        }
+    )
+    assert result
+
+
+@asynctest.mock.patch('mbddns.update', new=mbddns_update_mock)
+async def test_update_fails_if_wrong_token(hass):
+    """Run with incorrect token and check false is returned."""
+    result = await async_setup_component(
+        hass,
+        mythicbeastsdns.DOMAIN,
+        {
+            mythicbeastsdns.DOMAIN: {
+                'domain': 'example.org',
+                'password': 'incorrect',
+                'host': 'hass'
+            }
+        }
+    )
+    assert not result
+
+
+@asynctest.mock.patch('mbddns.update', new=mbddns_update_mock)
+async def test_update_fails_if_invalid_host(hass):
+    """Run with invalid characters in host and check false is returned."""
+    result = await async_setup_component(
+        hass,
+        mythicbeastsdns.DOMAIN,
+        {
+            mythicbeastsdns.DOMAIN: {
+                'domain': 'example.org',
+                'password': 'correct',
+                'host': '$hass'
+            }
+        }
+    )
+    assert not result
diff --git a/tests/components/test_ness_alarm.py b/tests/components/test_ness_alarm.py
new file mode 100644
index 00000000000..7d2104c9306
--- /dev/null
+++ b/tests/components/test_ness_alarm.py
@@ -0,0 +1,250 @@
+"""Tests for the ness_alarm component."""
+from enum import Enum
+
+import pytest
+from asynctest import patch, MagicMock
+
+from homeassistant.components import alarm_control_panel
+from homeassistant.components.ness_alarm import (
+    DOMAIN, CONF_DEVICE_PORT, CONF_DEVICE_HOST, CONF_ZONE_NAME, CONF_ZONES,
+    CONF_ZONE_ID, SERVICE_AUX, SERVICE_PANIC,
+    ATTR_CODE, ATTR_OUTPUT_ID)
+from homeassistant.const import (
+    STATE_ALARM_ARMING, SERVICE_ALARM_DISARM, ATTR_ENTITY_ID,
+    SERVICE_ALARM_ARM_AWAY, SERVICE_ALARM_ARM_HOME, SERVICE_ALARM_TRIGGER,
+    STATE_ALARM_DISARMED, STATE_ALARM_ARMED_AWAY, STATE_ALARM_PENDING,
+    STATE_ALARM_TRIGGERED, STATE_UNKNOWN)
+from homeassistant.setup import async_setup_component
+from tests.common import MockDependency
+
+VALID_CONFIG = {
+    DOMAIN: {
+        CONF_DEVICE_HOST: 'alarm.local',
+        CONF_DEVICE_PORT: 1234,
+        CONF_ZONES: [
+            {
+                CONF_ZONE_NAME: 'Zone 1',
+                CONF_ZONE_ID: 1,
+            },
+            {
+                CONF_ZONE_NAME: 'Zone 2',
+                CONF_ZONE_ID: 2,
+            }
+        ]
+    }
+}
+
+
+async def test_setup_platform(hass, mock_nessclient):
+    """Test platform setup."""
+    await async_setup_component(hass, DOMAIN, VALID_CONFIG)
+    assert hass.services.has_service(DOMAIN, 'panic')
+    assert hass.services.has_service(DOMAIN, 'aux')
+
+    await hass.async_block_till_done()
+    assert hass.states.get('alarm_control_panel.alarm_panel') is not None
+    assert hass.states.get('binary_sensor.zone_1') is not None
+    assert hass.states.get('binary_sensor.zone_2') is not None
+
+    assert mock_nessclient.keepalive.call_count == 1
+    assert mock_nessclient.update.call_count == 1
+
+
+async def test_panic_service(hass, mock_nessclient):
+    """Test calling panic service."""
+    await async_setup_component(hass, DOMAIN, VALID_CONFIG)
+    await hass.services.async_call(
+        DOMAIN, SERVICE_PANIC, blocking=True, service_data={
+            ATTR_CODE: '1234'
+        })
+    mock_nessclient.panic.assert_awaited_once_with('1234')
+
+
+async def test_aux_service(hass, mock_nessclient):
+    """Test calling aux service."""
+    await async_setup_component(hass, DOMAIN, VALID_CONFIG)
+    await hass.services.async_call(
+        DOMAIN, SERVICE_AUX, blocking=True, service_data={
+            ATTR_OUTPUT_ID: 1
+        })
+    mock_nessclient.aux.assert_awaited_once_with(1, True)
+
+
+async def test_dispatch_state_change(hass, mock_nessclient):
+    """Test calling aux service."""
+    await async_setup_component(hass, DOMAIN, VALID_CONFIG)
+    await hass.async_block_till_done()
+
+    on_state_change = mock_nessclient.on_state_change.call_args[0][0]
+    on_state_change(MockArmingState.ARMING)
+
+    await hass.async_block_till_done()
+    assert hass.states.is_state('alarm_control_panel.alarm_panel',
+                                STATE_ALARM_ARMING)
+
+
+async def test_alarm_disarm(hass, mock_nessclient):
+    """Test disarm."""
+    await async_setup_component(hass, DOMAIN, VALID_CONFIG)
+    await hass.async_block_till_done()
+
+    await hass.services.async_call(
+        alarm_control_panel.DOMAIN, SERVICE_ALARM_DISARM, blocking=True,
+        service_data={
+            ATTR_ENTITY_ID: 'alarm_control_panel.alarm_panel',
+            ATTR_CODE: '1234'
+        })
+    mock_nessclient.disarm.assert_called_once_with('1234')
+
+
+async def test_alarm_arm_away(hass, mock_nessclient):
+    """Test disarm."""
+    await async_setup_component(hass, DOMAIN, VALID_CONFIG)
+    await hass.async_block_till_done()
+
+    await hass.services.async_call(
+        alarm_control_panel.DOMAIN, SERVICE_ALARM_ARM_AWAY, blocking=True,
+        service_data={
+            ATTR_ENTITY_ID: 'alarm_control_panel.alarm_panel',
+            ATTR_CODE: '1234'
+        })
+    mock_nessclient.arm_away.assert_called_once_with('1234')
+
+
+async def test_alarm_arm_home(hass, mock_nessclient):
+    """Test disarm."""
+    await async_setup_component(hass, DOMAIN, VALID_CONFIG)
+    await hass.async_block_till_done()
+
+    await hass.services.async_call(
+        alarm_control_panel.DOMAIN, SERVICE_ALARM_ARM_HOME, blocking=True,
+        service_data={
+            ATTR_ENTITY_ID: 'alarm_control_panel.alarm_panel',
+            ATTR_CODE: '1234'
+        })
+    mock_nessclient.arm_home.assert_called_once_with('1234')
+
+
+async def test_alarm_trigger(hass, mock_nessclient):
+    """Test disarm."""
+    await async_setup_component(hass, DOMAIN, VALID_CONFIG)
+    await hass.async_block_till_done()
+
+    await hass.services.async_call(
+        alarm_control_panel.DOMAIN, SERVICE_ALARM_TRIGGER, blocking=True,
+        service_data={
+            ATTR_ENTITY_ID: 'alarm_control_panel.alarm_panel',
+            ATTR_CODE: '1234'
+        })
+    mock_nessclient.panic.assert_called_once_with('1234')
+
+
+async def test_dispatch_zone_change(hass, mock_nessclient):
+    """Test zone change events dispatch a signal to subscribers."""
+    await async_setup_component(hass, DOMAIN, VALID_CONFIG)
+    await hass.async_block_till_done()
+
+    on_zone_change = mock_nessclient.on_zone_change.call_args[0][0]
+    on_zone_change(1, True)
+
+    await hass.async_block_till_done()
+    assert hass.states.is_state('binary_sensor.zone_1', 'on')
+    assert hass.states.is_state('binary_sensor.zone_2', 'off')
+
+
+async def test_arming_state_change(hass, mock_nessclient):
+    """Test arming state change handing."""
+    states = [
+        (MockArmingState.UNKNOWN, STATE_UNKNOWN),
+        (MockArmingState.DISARMED, STATE_ALARM_DISARMED),
+        (MockArmingState.ARMING, STATE_ALARM_ARMING),
+        (MockArmingState.EXIT_DELAY, STATE_ALARM_ARMING),
+        (MockArmingState.ARMED, STATE_ALARM_ARMED_AWAY),
+        (MockArmingState.ENTRY_DELAY, STATE_ALARM_PENDING),
+        (MockArmingState.TRIGGERED, STATE_ALARM_TRIGGERED),
+    ]
+
+    await async_setup_component(hass, DOMAIN, VALID_CONFIG)
+    await hass.async_block_till_done()
+    assert hass.states.is_state('alarm_control_panel.alarm_panel',
+                                STATE_UNKNOWN)
+    on_state_change = mock_nessclient.on_state_change.call_args[0][0]
+
+    for arming_state, expected_state in states:
+        on_state_change(arming_state)
+        await hass.async_block_till_done()
+        assert hass.states.is_state('alarm_control_panel.alarm_panel',
+                                    expected_state)
+
+
+class MockArmingState(Enum):
+    """Mock nessclient.ArmingState enum."""
+
+    UNKNOWN = 'UNKNOWN'
+    DISARMED = 'DISARMED'
+    ARMING = 'ARMING'
+    EXIT_DELAY = 'EXIT_DELAY'
+    ARMED = 'ARMED'
+    ENTRY_DELAY = 'ENTRY_DELAY'
+    TRIGGERED = 'TRIGGERED'
+
+
+class MockClient:
+    """Mock nessclient.Client stub."""
+
+    async def panic(self, code):
+        """Handle panic."""
+        pass
+
+    async def disarm(self, code):
+        """Handle disarm."""
+        pass
+
+    async def arm_away(self, code):
+        """Handle arm_away."""
+        pass
+
+    async def arm_home(self, code):
+        """Handle arm_home."""
+        pass
+
+    async def aux(self, output_id, state):
+        """Handle auxiliary control."""
+        pass
+
+    async def keepalive(self):
+        """Handle keepalive."""
+        pass
+
+    async def update(self):
+        """Handle update."""
+        pass
+
+    def on_zone_change(self):
+        """Handle on_zone_change."""
+        pass
+
+    def on_state_change(self):
+        """Handle on_state_change."""
+        pass
+
+    async def close(self):
+        """Handle close."""
+        pass
+
+
+@pytest.fixture
+def mock_nessclient():
+    """Mock the nessclient Client constructor.
+
+    Replaces nessclient.Client with a Mock which always returns the same
+    MagicMock() instance.
+    """
+    _mock_instance = MagicMock(MockClient())
+    _mock_factory = MagicMock()
+    _mock_factory.return_value = _mock_instance
+
+    with MockDependency('nessclient'), \
+        patch('nessclient.Client', new=_mock_factory, create=True), \
+            patch('nessclient.ArmingState', new=MockArmingState):
+        yield _mock_instance
diff --git a/tests/components/test_plant.py b/tests/components/test_plant.py
index 6118e30925e..13cfb310bcd 100644
--- a/tests/components/test_plant.py
+++ b/tests/components/test_plant.py
@@ -86,6 +86,20 @@ class TestPlant(unittest.TestCase):
         assert sensor.state == 'problem'
         assert sensor.state_attributes['problem'] == 'battery low'
 
+    def test_initial_states(self):
+        """Test plant initialises attributes if sensor already exists."""
+        self.hass.states.set(MOISTURE_ENTITY, 5,
+                             {ATTR_UNIT_OF_MEASUREMENT: 'us/cm'})
+        plant_name = 'some_plant'
+        assert setup_component(self.hass, plant.DOMAIN, {
+            plant.DOMAIN: {
+                plant_name: GOOD_CONFIG
+            }
+        })
+        self.hass.block_till_done()
+        state = self.hass.states.get('plant.'+plant_name)
+        assert 5 == state.attributes[plant.READING_MOISTURE]
+
     def test_update_states(self):
         """Test updating the state of a sensor.
 
diff --git a/tests/components/test_rflink.py b/tests/components/test_rflink.py
index ccb88018c66..46cbef92aa4 100644
--- a/tests/components/test_rflink.py
+++ b/tests/components/test_rflink.py
@@ -1,32 +1,29 @@
-"""Common functions for Rflink component tests and generic platform tests."""
+"""Common functions for RFLink component tests and generic platform tests."""
 
-import asyncio
 from unittest.mock import Mock
 
 from homeassistant.bootstrap import async_setup_component
 from homeassistant.components.rflink import (
-    CONF_RECONNECT_INTERVAL, SERVICE_SEND_COMMAND)
+    CONF_RECONNECT_INTERVAL, SERVICE_SEND_COMMAND, RflinkCommand,
+    TMP_ENTITY, DATA_ENTITY_LOOKUP, EVENT_KEY_COMMAND, EVENT_KEY_SENSOR)
 from homeassistant.const import (
     ATTR_ENTITY_ID, SERVICE_TURN_OFF, SERVICE_STOP_COVER)
 
 
-@asyncio.coroutine
-def mock_rflink(hass, config, domain, monkeypatch, failures=None):
-    """Create mock Rflink asyncio protocol, test component setup."""
+async def mock_rflink(hass, config, domain, monkeypatch, failures=None,
+                      failcommand=False):
+    """Create mock RFLink asyncio protocol, test component setup."""
     transport, protocol = (Mock(), Mock())
 
-    @asyncio.coroutine
-    def send_command_ack(*command):
-        return True
+    async def send_command_ack(*command):
+        return not failcommand
     protocol.send_command_ack = Mock(wraps=send_command_ack)
 
-    @asyncio.coroutine
     def send_command(*command):
-        return True
+        return not failcommand
     protocol.send_command = Mock(wraps=send_command)
 
-    @asyncio.coroutine
-    def create_rflink_connection(*args, **kwargs):
+    async def create_rflink_connection(*args, **kwargs):
         """Return mocked transport and protocol."""
         # failures can be a list of booleans indicating in which sequence
         # creating a connection should success or fail
@@ -45,7 +42,7 @@ def mock_rflink(hass, config, domain, monkeypatch, failures=None):
         'rflink.protocol.create_rflink_connection',
         mock_create)
 
-    yield from async_setup_component(hass, domain, config)
+    await async_setup_component(hass, domain, config)
 
     # hook into mock config for injecting events
     event_callback = mock_create.call_args_list[0][1]['event_callback']
@@ -57,8 +54,7 @@ def mock_rflink(hass, config, domain, monkeypatch, failures=None):
     return event_callback, mock_create, protocol, disconnect_callback
 
 
-@asyncio.coroutine
-def test_version_banner(hass, monkeypatch):
+async def test_version_banner(hass, monkeypatch):
     """Test sending unknown commands doesn't cause issues."""
     # use sensor domain during testing main platform
     domain = 'sensor'
@@ -73,7 +69,7 @@ def test_version_banner(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    event_callback, _, _, _ = yield from mock_rflink(
+    event_callback, _, _, _ = await mock_rflink(
         hass, config, domain, monkeypatch)
 
     event_callback({
@@ -84,8 +80,7 @@ def test_version_banner(hass, monkeypatch):
     })
 
 
-@asyncio.coroutine
-def test_send_no_wait(hass, monkeypatch):
+async def test_send_no_wait(hass, monkeypatch):
     """Test command sending without ack."""
     domain = 'switch'
     config = {
@@ -97,27 +92,26 @@ def test_send_no_wait(hass, monkeypatch):
             'platform': 'rflink',
             'devices': {
                 'protocol_0_0': {
-                        'name': 'test',
-                        'aliases': ['test_alias_0_0'],
+                    'name': 'test',
+                    'aliases': ['test_alias_0_0'],
                 },
             },
         },
     }
 
     # setup mocking rflink module
-    _, _, protocol, _ = yield from mock_rflink(
+    _, _, protocol, _ = await mock_rflink(
         hass, config, domain, monkeypatch)
 
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(domain, SERVICE_TURN_OFF,
                                  {ATTR_ENTITY_ID: 'switch.test'}))
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
     assert protocol.send_command.call_args_list[0][0][0] == 'protocol_0_0'
     assert protocol.send_command.call_args_list[0][0][1] == 'off'
 
 
-@asyncio.coroutine
-def test_cover_send_no_wait(hass, monkeypatch):
+async def test_cover_send_no_wait(hass, monkeypatch):
     """Test command sending to a cover device without ack."""
     domain = 'cover'
     config = {
@@ -129,27 +123,26 @@ def test_cover_send_no_wait(hass, monkeypatch):
             'platform': 'rflink',
             'devices': {
                 'RTS_0100F2_0': {
-                        'name': 'test',
-                        'aliases': ['test_alias_0_0'],
+                    'name': 'test',
+                    'aliases': ['test_alias_0_0'],
                 },
             },
         },
     }
 
     # setup mocking rflink module
-    _, _, protocol, _ = yield from mock_rflink(
+    _, _, protocol, _ = await mock_rflink(
         hass, config, domain, monkeypatch)
 
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(domain, SERVICE_STOP_COVER,
                                  {ATTR_ENTITY_ID: 'cover.test'}))
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
     assert protocol.send_command.call_args_list[0][0][0] == 'RTS_0100F2_0'
     assert protocol.send_command.call_args_list[0][0][1] == 'STOP'
 
 
-@asyncio.coroutine
-def test_send_command(hass, monkeypatch):
+async def test_send_command(hass, monkeypatch):
     """Test send_command service."""
     domain = 'rflink'
     config = {
@@ -159,21 +152,20 @@ def test_send_command(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    _, _, protocol, _ = yield from mock_rflink(
+    _, _, protocol, _ = await mock_rflink(
         hass, config, domain, monkeypatch)
 
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(domain, SERVICE_SEND_COMMAND,
                                  {'device_id': 'newkaku_0000c6c2_1',
                                   'command': 'on'}))
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
     assert (protocol.send_command_ack.call_args_list[0][0][0]
             == 'newkaku_0000c6c2_1')
     assert protocol.send_command_ack.call_args_list[0][0][1] == 'on'
 
 
-@asyncio.coroutine
-def test_send_command_invalid_arguments(hass, monkeypatch):
+async def test_send_command_invalid_arguments(hass, monkeypatch):
     """Test send_command service."""
     domain = 'rflink'
     config = {
@@ -183,25 +175,32 @@ def test_send_command_invalid_arguments(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    _, _, protocol, _ = yield from mock_rflink(
+    _, _, protocol, _ = await mock_rflink(
         hass, config, domain, monkeypatch)
 
     # one argument missing
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(domain, SERVICE_SEND_COMMAND,
                                  {'command': 'on'}))
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(domain, SERVICE_SEND_COMMAND,
                                  {'device_id': 'newkaku_0000c6c2_1'}))
     # no arguments
-    hass.async_add_job(
+    hass.async_create_task(
         hass.services.async_call(domain, SERVICE_SEND_COMMAND, {}))
-    yield from hass.async_block_till_done()
+
+    await hass.async_block_till_done()
     assert protocol.send_command_ack.call_args_list == []
 
+    # bad command (no_command)
+    success = await hass.services.async_call(
+        domain, SERVICE_SEND_COMMAND, {
+            'device_id': 'newkaku_0000c6c2_1',
+            'command': 'no_command'})
+    assert not success, 'send command should not succeed for unknown command'
 
-@asyncio.coroutine
-def test_reconnecting_after_disconnect(hass, monkeypatch):
+
+async def test_reconnecting_after_disconnect(hass, monkeypatch):
     """An unexpected disconnect should cause a reconnect."""
     domain = 'sensor'
     config = {
@@ -215,7 +214,7 @@ def test_reconnecting_after_disconnect(hass, monkeypatch):
     }
 
     # setup mocking rflink module
-    _, mock_create, _, disconnect_callback = yield from mock_rflink(
+    _, mock_create, _, disconnect_callback = await mock_rflink(
         hass, config, domain, monkeypatch)
 
     assert disconnect_callback, 'disconnect callback not passed to rflink'
@@ -223,14 +222,13 @@ def test_reconnecting_after_disconnect(hass, monkeypatch):
     # rflink initiated disconnect
     disconnect_callback(None)
 
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     # we expect 2 call, the initial and reconnect
     assert mock_create.call_count == 2
 
 
-@asyncio.coroutine
-def test_reconnecting_after_failure(hass, monkeypatch):
+async def test_reconnecting_after_failure(hass, monkeypatch):
     """A failure to reconnect should be retried."""
     domain = 'sensor'
     config = {
@@ -247,22 +245,21 @@ def test_reconnecting_after_failure(hass, monkeypatch):
     failures = [False, True, False]
 
     # setup mocking rflink module
-    _, mock_create, _, disconnect_callback = yield from mock_rflink(
+    _, mock_create, _, disconnect_callback = await mock_rflink(
         hass, config, domain, monkeypatch, failures=failures)
 
     # rflink initiated disconnect
     disconnect_callback(None)
 
     # wait for reconnects to have happened
-    yield from hass.async_block_till_done()
-    yield from hass.async_block_till_done()
+    await hass.async_block_till_done()
+    await hass.async_block_till_done()
 
     # we expect 3 calls, the initial and 2 reconnects
     assert mock_create.call_count == 3
 
 
-@asyncio.coroutine
-def test_error_when_not_connected(hass, monkeypatch):
+async def test_error_when_not_connected(hass, monkeypatch):
     """Sending command should error when not connected."""
     domain = 'switch'
     config = {
@@ -274,8 +271,8 @@ def test_error_when_not_connected(hass, monkeypatch):
             'platform': 'rflink',
             'devices': {
                 'protocol_0_0': {
-                        'name': 'test',
-                        'aliases': ['test_alias_0_0'],
+                    'name': 'test',
+                    'aliases': ['test_alias_0_0'],
                 },
             },
         },
@@ -285,14 +282,104 @@ def test_error_when_not_connected(hass, monkeypatch):
     failures = [False, True, False]
 
     # setup mocking rflink module
-    _, mock_create, _, disconnect_callback = yield from mock_rflink(
+    _, _, _, disconnect_callback = await mock_rflink(
         hass, config, domain, monkeypatch, failures=failures)
 
     # rflink initiated disconnect
     disconnect_callback(None)
 
-    yield from asyncio.sleep(0, loop=hass.loop)
-
-    success = yield from hass.services.async_call(
+    success = await hass.services.async_call(
         domain, SERVICE_TURN_OFF, {ATTR_ENTITY_ID: 'switch.test'})
     assert not success, 'changing state should not succeed when disconnected'
+
+
+async def test_async_send_command_error(hass, monkeypatch):
+    """Sending command should error when protocol fails."""
+    domain = 'rflink'
+    config = {
+        'rflink': {
+            'port': '/dev/ttyABC0',
+        },
+    }
+
+    # setup mocking rflink module
+    _, _, protocol, _ = await mock_rflink(
+        hass, config, domain, monkeypatch, failcommand=True)
+
+    success = await hass.services.async_call(
+        domain, SERVICE_SEND_COMMAND, {
+            'device_id': 'newkaku_0000c6c2_1',
+            'command': SERVICE_TURN_OFF})
+    await hass.async_block_till_done()
+    assert not success, 'send command should not succeed if failcommand=True'
+    assert (protocol.send_command_ack.call_args_list[0][0][0]
+            == 'newkaku_0000c6c2_1')
+    assert (protocol.send_command_ack.call_args_list[0][0][1]
+            == SERVICE_TURN_OFF)
+
+
+async def test_race_condition(hass, monkeypatch):
+    """Test race condition for unknown components."""
+    domain = 'light'
+    config = {
+        'rflink': {
+            'port': '/dev/ttyABC0',
+        },
+        domain: {
+            'platform': 'rflink',
+        },
+    }
+    tmp_entity = TMP_ENTITY.format('test3')
+
+    # setup mocking rflink module
+    event_callback, _, _, _ = await mock_rflink(
+        hass, config, domain, monkeypatch)
+
+    # test event for new unconfigured sensor
+    event_callback({
+        'id': 'test3',
+        'command': 'off',
+    })
+    event_callback({
+        'id': 'test3',
+        'command': 'on',
+    })
+
+    # tmp_entity added to EVENT_KEY_COMMAND
+    assert tmp_entity in hass.data[DATA_ENTITY_LOOKUP][
+        EVENT_KEY_COMMAND]['test3']
+    # tmp_entity must no be added to EVENT_KEY_SENSOR
+    assert tmp_entity not in hass.data[DATA_ENTITY_LOOKUP][
+        EVENT_KEY_SENSOR]['test3']
+
+    await hass.async_block_till_done()
+
+    # test  state of new sensor
+    new_sensor = hass.states.get(domain+'.test3')
+    assert new_sensor
+    assert new_sensor.state == 'off'
+
+    event_callback({
+        'id': 'test3',
+        'command': 'on',
+    })
+    await hass.async_block_till_done()
+    # tmp_entity must be deleted from EVENT_KEY_COMMAND
+    assert tmp_entity not in hass.data[DATA_ENTITY_LOOKUP][
+        EVENT_KEY_COMMAND]['test3']
+
+    # test  state of new sensor
+    new_sensor = hass.states.get(domain+'.test3')
+    assert new_sensor
+    assert new_sensor.state == 'on'
+
+
+async def test_not_connected(hass, monkeypatch):
+    """Test Error when sending commands to a disconnected device."""
+    import pytest
+    from homeassistant.core import HomeAssistantError
+
+    test_device = RflinkCommand('DUMMY_DEVICE')
+    RflinkCommand.set_rflink_protocol(None)
+    with pytest.raises(HomeAssistantError):
+        await test_device._async_handle_command('turn_on')
diff --git a/tests/components/test_splunk.py b/tests/components/test_splunk.py
index a39143f14bb..f3cefb9c2d9 100644
--- a/tests/components/test_splunk.py
+++ b/tests/components/test_splunk.py
@@ -31,6 +31,7 @@ class TestSplunk(unittest.TestCase):
                 'port': 123,
                 'token': 'secret',
                 'ssl': 'False',
+                'verify_ssl': 'True',
                 'name': 'hostname',
             }
         }
@@ -88,10 +89,9 @@ class TestSplunk(unittest.TestCase):
         }
 
         for in_, out in valid.items():
-            state = mock.MagicMock(state=in_,
-                                   domain='fake',
-                                   object_id='entity',
-                                   attributes={'datetime_attr': now})
+            state = mock.MagicMock(
+                state=in_, domain='fake', object_id='entity',
+                attributes={'datetime_attr': now})
             event = mock.MagicMock(data={'new_state': state}, time_fired=12345)
 
             try:
@@ -118,6 +118,5 @@ class TestSplunk(unittest.TestCase):
                 mock.call(
                     payload['host'], data=json.dumps(payload),
                     headers={'Authorization': 'Splunk secret'},
-                    timeout=10
-                )
+                    timeout=10, verify=True)
             self.mock_post.reset_mock()
diff --git a/tests/components/timer/test_init.py b/tests/components/timer/test_init.py
index 62a57efb040..648807927d2 100644
--- a/tests/components/timer/test_init.py
+++ b/tests/components/timer/test_init.py
@@ -9,7 +9,8 @@ from homeassistant.setup import async_setup_component
 from homeassistant.components.timer import (
     DOMAIN, CONF_DURATION, CONF_NAME, STATUS_ACTIVE, STATUS_IDLE,
     STATUS_PAUSED, CONF_ICON, ATTR_DURATION, EVENT_TIMER_FINISHED,
-    EVENT_TIMER_CANCELLED, SERVICE_START, SERVICE_PAUSE, SERVICE_CANCEL,
+    EVENT_TIMER_CANCELLED, EVENT_TIMER_STARTED, EVENT_TIMER_RESTARTED,
+    EVENT_TIMER_PAUSED, SERVICE_START, SERVICE_PAUSE, SERVICE_CANCEL,
     SERVICE_FINISH)
 from homeassistant.const import (ATTR_ICON, ATTR_FRIENDLY_NAME, CONF_ENTITY_ID)
 from homeassistant.util.dt import utcnow
@@ -94,6 +95,105 @@ def test_methods_and_events(hass):
         """Fake event listener for trigger."""
         results.append(event)
 
+    hass.bus.async_listen(EVENT_TIMER_STARTED, fake_event_listener)
+    hass.bus.async_listen(EVENT_TIMER_RESTARTED, fake_event_listener)
+    hass.bus.async_listen(EVENT_TIMER_PAUSED, fake_event_listener)
+    hass.bus.async_listen(EVENT_TIMER_FINISHED, fake_event_listener)
+    hass.bus.async_listen(EVENT_TIMER_CANCELLED, fake_event_listener)
+
+    steps = [
+        {
+            'call': SERVICE_START,
+            'state': STATUS_ACTIVE,
+            'event': EVENT_TIMER_STARTED,
+        },
+        {
+            'call': SERVICE_PAUSE,
+            'state': STATUS_PAUSED,
+            'event': EVENT_TIMER_PAUSED,
+        },
+        {
+            'call': SERVICE_START,
+            'state': STATUS_ACTIVE,
+            'event': EVENT_TIMER_RESTARTED,
+        },
+        {
+            'call': SERVICE_CANCEL,
+            'state': STATUS_IDLE,
+            'event': EVENT_TIMER_CANCELLED,
+        },
+        {
+            'call': SERVICE_START,
+            'state': STATUS_ACTIVE,
+            'event': EVENT_TIMER_STARTED,
+        },
+        {
+            'call': SERVICE_FINISH,
+            'state': STATUS_IDLE,
+            'event': EVENT_TIMER_FINISHED,
+        },
+        {
+            'call': SERVICE_START,
+            'state': STATUS_ACTIVE,
+            'event': EVENT_TIMER_STARTED,
+        },
+        {
+            'call': SERVICE_PAUSE,
+            'state': STATUS_PAUSED,
+            'event': EVENT_TIMER_PAUSED,
+        },
+        {
+            'call': SERVICE_CANCEL,
+            'state': STATUS_IDLE,
+            'event': EVENT_TIMER_CANCELLED,
+        }
+    ]
+
+    expectedEvents = 0
+    for step in steps:
+        if step['call'] is not None:
+            yield from hass.services.async_call(
+                DOMAIN,
+                step['call'],
+                {CONF_ENTITY_ID: 'timer.test1'}
+            )
+            yield from hass.async_block_till_done()
+
+        state = hass.states.get('timer.test1')
+        assert state
+        if step['state'] is not None:
+            assert state.state == step['state']
+
+        if step['event'] is not None:
+            expectedEvents += 1
+            assert results[-1].event_type == step['event']
+            assert len(results) == expectedEvents
+
+
+@asyncio.coroutine
+def test_wait_till_timer_expires(hass):
+    """Test for a timer to end."""
+    hass.state = CoreState.starting
+
+    yield from async_setup_component(hass, DOMAIN, {
+        DOMAIN: {
+            'test1': {
+                CONF_DURATION: 10,
+            }
+        }})
+
+    state = hass.states.get('timer.test1')
+    assert state
+    assert state.state == STATUS_IDLE
+
+    results = []
+
+    def fake_event_listener(event):
+        """Fake event listener for trigger."""
+        results.append(event)
+
+    hass.bus.async_listen(EVENT_TIMER_STARTED, fake_event_listener)
+    hass.bus.async_listen(EVENT_TIMER_PAUSED, fake_event_listener)
     hass.bus.async_listen(EVENT_TIMER_FINISHED, fake_event_listener)
     hass.bus.async_listen(EVENT_TIMER_CANCELLED, fake_event_listener)
 
@@ -106,35 +206,8 @@ def test_methods_and_events(hass):
     assert state
     assert state.state == STATUS_ACTIVE
 
-    yield from hass.services.async_call(DOMAIN,
-                                        SERVICE_PAUSE,
-                                        {CONF_ENTITY_ID: 'timer.test1'})
-    yield from hass.async_block_till_done()
-
-    state = hass.states.get('timer.test1')
-    assert state
-    assert state.state == STATUS_PAUSED
-
-    yield from hass.services.async_call(DOMAIN,
-                                        SERVICE_CANCEL,
-                                        {CONF_ENTITY_ID: 'timer.test1'})
-    yield from hass.async_block_till_done()
-
-    state = hass.states.get('timer.test1')
-    assert state
-    assert state.state == STATUS_IDLE
-
+    assert results[-1].event_type == EVENT_TIMER_STARTED
     assert len(results) == 1
-    assert results[-1].event_type == EVENT_TIMER_CANCELLED
-
-    yield from hass.services.async_call(DOMAIN,
-                                        SERVICE_START,
-                                        {CONF_ENTITY_ID: 'timer.test1'})
-    yield from hass.async_block_till_done()
-
-    state = hass.states.get('timer.test1')
-    assert state
-    assert state.state == STATUS_ACTIVE
 
     async_fire_time_changed(hass, utcnow() + timedelta(seconds=10))
     yield from hass.async_block_till_done()
@@ -143,29 +216,8 @@ def test_methods_and_events(hass):
     assert state
     assert state.state == STATUS_IDLE
 
+    assert results[-1].event_type == EVENT_TIMER_FINISHED
     assert len(results) == 2
-    assert results[-1].event_type == EVENT_TIMER_FINISHED
-
-    yield from hass.services.async_call(DOMAIN,
-                                        SERVICE_START,
-                                        {CONF_ENTITY_ID: 'timer.test1'})
-    yield from hass.async_block_till_done()
-
-    state = hass.states.get('timer.test1')
-    assert state
-    assert state.state == STATUS_ACTIVE
-
-    yield from hass.services.async_call(DOMAIN,
-                                        SERVICE_FINISH,
-                                        {CONF_ENTITY_ID: 'timer.test1'})
-    yield from hass.async_block_till_done()
-
-    state = hass.states.get('timer.test1')
-    assert state
-    assert state.state == STATUS_IDLE
-
-    assert len(results) == 3
-    assert results[-1].event_type == EVENT_TIMER_FINISHED
 
 
 @asyncio.coroutine
diff --git a/tests/components/upnp/test_config_flow.py b/tests/components/upnp/test_config_flow.py
deleted file mode 100644
index 968c59955e2..00000000000
--- a/tests/components/upnp/test_config_flow.py
+++ /dev/null
@@ -1,261 +0,0 @@
-"""Tests for UPnP/IGD config flow."""
-
-from homeassistant.components import upnp
-from homeassistant.components.upnp import config_flow as upnp_config_flow
-
-from tests.common import MockConfigEntry
-
-
-async def test_flow_none_discovered(hass):
-    """Test no device discovered flow."""
-    flow = upnp_config_flow.UpnpFlowHandler()
-    flow.hass = hass
-    hass.data[upnp.DOMAIN] = {
-        'discovered': {}
-    }
-
-    result = await flow.async_step_user()
-    assert result['type'] == 'abort'
-    assert result['reason'] == 'no_devices_discovered'
-
-
-async def test_flow_already_configured(hass):
-    """Test device already configured flow."""
-    flow = upnp_config_flow.UpnpFlowHandler()
-    flow.hass = hass
-
-    # discovered device
-    udn = 'uuid:device_1'
-    hass.data[upnp.DOMAIN] = {
-        'discovered': {
-            udn: {
-                'friendly_name': '192.168.1.1 (Test device)',
-                'host': '192.168.1.1',
-                'udn': udn,
-            },
-        },
-    }
-
-    # configured entry
-    MockConfigEntry(domain=upnp.DOMAIN, data={
-        'udn': udn,
-        'host': '192.168.1.1',
-    }).add_to_hass(hass)
-
-    result = await flow.async_step_user({
-        'name': '192.168.1.1 (Test device)',
-        'enable_sensors': True,
-        'enable_port_mapping': False,
-    })
-    assert result['type'] == 'abort'
-    assert result['reason'] == 'already_configured'
-
-
-async def test_flow_no_sensors_no_port_mapping(hass):
-    """Test single device, no sensors, no port_mapping."""
-    flow = upnp_config_flow.UpnpFlowHandler()
-    flow.hass = hass
-
-    # discovered device
-    udn = 'uuid:device_1'
-    hass.data[upnp.DOMAIN] = {
-        'discovered': {
-            udn: {
-                'friendly_name': '192.168.1.1 (Test device)',
-                'host': '192.168.1.1',
-                'udn': udn,
-            },
-        },
-    }
-
-    # configured entry
-    MockConfigEntry(domain=upnp.DOMAIN, data={
-        'udn': udn,
-        'host': '192.168.1.1',
-    }).add_to_hass(hass)
-
-    result = await flow.async_step_user({
-        'name': '192.168.1.1 (Test device)',
-        'enable_sensors': False,
-        'enable_port_mapping': False,
-    })
-    assert result['type'] == 'abort'
-    assert result['reason'] == 'no_sensors_or_port_mapping'
-
-
-async def test_flow_discovered_form(hass):
-    """Test single device discovered, show form flow."""
-    flow = upnp_config_flow.UpnpFlowHandler()
-    flow.hass = hass
-
-    # discovered device
-    udn = 'uuid:device_1'
-    hass.data[upnp.DOMAIN] = {
-        'discovered': {
-            udn: {
-                'friendly_name': '192.168.1.1 (Test device)',
-                'host': '192.168.1.1',
-                'udn': udn,
-            },
-        },
-    }
-
-    result = await flow.async_step_user()
-    assert result['type'] == 'form'
-    assert result['step_id'] == 'user'
-
-
-async def test_flow_two_discovered_form(hass):
-    """Test two devices discovered, show form flow with two devices."""
-    flow = upnp_config_flow.UpnpFlowHandler()
-    flow.hass = hass
-
-    # discovered device
-    udn_1 = 'uuid:device_1'
-    udn_2 = 'uuid:device_2'
-    hass.data[upnp.DOMAIN] = {
-        'discovered': {
-            udn_1: {
-                'friendly_name': '192.168.1.1 (Test device)',
-                'host': '192.168.1.1',
-                'udn': udn_1,
-            },
-            udn_2: {
-                'friendly_name': '192.168.2.1 (Test device)',
-                'host': '192.168.2.1',
-                'udn': udn_2,
-            },
-        },
-    }
-
-    result = await flow.async_step_user()
-    assert result['type'] == 'form'
-    assert result['step_id'] == 'user'
-    assert result['data_schema']({
-        'name': '192.168.1.1 (Test device)',
-        'enable_sensors': True,
-        'enable_port_mapping': False,
-    })
-    assert result['data_schema']({
-        'name': '192.168.2.1 (Test device)',
-        'enable_sensors': True,
-        'enable_port_mapping': False,
-    })
-
-
-async def test_config_entry_created(hass):
-    """Test config entry is created."""
-    flow = upnp_config_flow.UpnpFlowHandler()
-    flow.hass = hass
-
-    # discovered device
-    hass.data[upnp.DOMAIN] = {
-        'discovered': {
-            'uuid:device_1': {
-                'friendly_name': '192.168.1.1 (Test device)',
-                'name': 'Test device 1',
-                'host': '192.168.1.1',
-                'ssdp_description': 'http://192.168.1.1/desc.xml',
-                'udn': 'uuid:device_1',
-            },
-        },
-    }
-
-    result = await flow.async_step_user({
-        'name': '192.168.1.1 (Test device)',
-        'enable_sensors': True,
-        'enable_port_mapping': False,
-    })
-    assert result['type'] == 'create_entry'
-    assert result['data'] == {
-        'ssdp_description': 'http://192.168.1.1/desc.xml',
-        'udn': 'uuid:device_1',
-        'port_mapping': False,
-        'sensors': True,
-    }
-    assert result['title'] == 'Test device 1'
-
-
-async def test_flow_discovery_no_data(hass):
-    """Test creation of device with auto_config."""
-    flow = upnp_config_flow.UpnpFlowHandler()
-    flow.hass = hass
-
-    # auto_config active
-    hass.data[upnp.DOMAIN] = {
-        'auto_config': {
-            'active': True,
-            'enable_port_mapping': False,
-            'enable_sensors': True,
-        },
-    }
-
-    # discovered device
-    result = await flow.async_step_discovery({})
-
-    assert result['type'] == 'abort'
-    assert result['reason'] == 'incomplete_device'
-
-
-async def test_flow_discovery_auto_config_sensors(hass):
-    """Test creation of device with auto_config."""
-    flow = upnp_config_flow.UpnpFlowHandler()
-    flow.hass = hass
-
-    # auto_config active
-    hass.data[upnp.DOMAIN] = {
-        'auto_config': {
-            'active': True,
-            'enable_port_mapping': False,
-            'enable_sensors': True,
-        },
-    }
-
-    # discovered device
-    result = await flow.async_step_discovery({
-        'name': 'Test device 1',
-        'host': '192.168.1.1',
-        'ssdp_description': 'http://192.168.1.1/desc.xml',
-        'udn': 'uuid:device_1',
-    })
-
-    assert result['type'] == 'create_entry'
-    assert result['data'] == {
-        'ssdp_description': 'http://192.168.1.1/desc.xml',
-        'udn': 'uuid:device_1',
-        'sensors': True,
-        'port_mapping': False,
-    }
-    assert result['title'] == 'Test device 1'
-
-
-async def test_flow_discovery_auto_config_sensors_port_mapping(hass):
-    """Test creation of device with auto_config, with port mapping."""
-    flow = upnp_config_flow.UpnpFlowHandler()
-    flow.hass = hass
-
-    # auto_config active, with port_mapping
-    hass.data[upnp.DOMAIN] = {
-        'auto_config': {
-            'active': True,
-            'enable_port_mapping': True,
-            'enable_sensors': True,
-        },
-    }
-
-    # discovered device
-    result = await flow.async_step_discovery({
-        'name': 'Test device 1',
-        'host': '192.168.1.1',
-        'ssdp_description': 'http://192.168.1.1/desc.xml',
-        'udn': 'uuid:device_1',
-    })
-
-    assert result['type'] == 'create_entry'
-    assert result['data'] == {
-        'udn': 'uuid:device_1',
-        'ssdp_description': 'http://192.168.1.1/desc.xml',
-        'sensors': True,
-        'port_mapping': True,
-    }
-    assert result['title'] == 'Test device 1'
diff --git a/tests/components/upnp/test_init.py b/tests/components/upnp/test_init.py
index 6b2611b2509..8762811059a 100644
--- a/tests/components/upnp/test_init.py
+++ b/tests/components/upnp/test_init.py
@@ -26,7 +26,7 @@ class MockDevice(Device):
     @classmethod
     async def async_create_device(cls, hass, ssdp_description):
         """Return self."""
-        return cls()
+        return cls('UDN')
 
     @property
     def udn(self):
@@ -47,102 +47,10 @@ class MockDevice(Device):
         self.removed_port_mappings.append(entry)
 
 
-async def test_async_setup_no_auto_config(hass):
-    """Test async_setup."""
-    # setup component, enable auto_config
-    config = {
-        'discovery': {},
-        # no upnp
-    }
-    with MockDependency('netdisco.discovery'), \
-        patch('homeassistant.components.upnp.config_flow.get_local_ip',
-              return_value='192.168.1.10'):
-        await async_setup_component(hass, 'upnp', config)
-        await hass.async_block_till_done()
-
-    assert hass.data[upnp.DOMAIN]['auto_config'] == {
-        'active': False,
-        'enable_sensors': False,
-        'enable_port_mapping': False,
-        'ports': {'hass': 'hass'},
-    }
-
-
-async def test_async_setup_auto_config(hass):
-    """Test async_setup."""
-    # setup component, enable auto_config
-    config = {
-        'discovery': {},
-        'upnp': {},
-    }
-    with MockDependency('netdisco.discovery'), \
-        patch('homeassistant.components.upnp.config_flow.get_local_ip',
-              return_value='192.168.1.10'):
-        await async_setup_component(hass, 'upnp', config)
-        await hass.async_block_till_done()
-
-    assert hass.data[upnp.DOMAIN]['auto_config'] == {
-        'active': True,
-        'enable_sensors': True,
-        'enable_port_mapping': False,
-        'ports': {'hass': 'hass'},
-    }
-
-
-async def test_async_setup_auto_config_port_mapping(hass):
-    """Test async_setup."""
-    # setup component, enable auto_config
-    config = {
-        'discovery': {},
-        'upnp': {
-            'port_mapping': True,
-            'ports': {'hass': 'hass'},
-        },
-    }
-    with MockDependency('netdisco.discovery'), \
-        patch('homeassistant.components.upnp.config_flow.get_local_ip',
-              return_value='192.168.1.10'):
-        await async_setup_component(hass, 'upnp', config)
-        await hass.async_block_till_done()
-
-    assert hass.data[upnp.DOMAIN]['auto_config'] == {
-        'active': True,
-        'enable_sensors': True,
-        'enable_port_mapping': True,
-        'ports': {'hass': 'hass'},
-    }
-
-
-async def test_async_setup_auto_config_no_sensors(hass):
-    """Test async_setup."""
-    # setup component, enable auto_config
-    config = {
-        'discovery': {},
-        'upnp': {'sensors': False},
-    }
-    with MockDependency('netdisco.discovery'), \
-        patch('homeassistant.components.upnp.config_flow.get_local_ip',
-              return_value='192.168.1.10'):
-        await async_setup_component(hass, 'upnp', config)
-        await hass.async_block_till_done()
-
-    assert hass.data[upnp.DOMAIN]['auto_config'] == {
-        'active': True,
-        'enable_sensors': False,
-        'enable_port_mapping': False,
-        'ports': {'hass': 'hass'},
-    }
-
-
 async def test_async_setup_entry_default(hass):
     """Test async_setup_entry."""
     udn = 'uuid:device_1'
-    entry = MockConfigEntry(domain=upnp.DOMAIN, data={
-        'ssdp_description': 'http://192.168.1.1/desc.xml',
-        'udn': udn,
-        'sensors': True,
-        'port_mapping': False,
-    })
+    entry = MockConfigEntry(domain=upnp.DOMAIN)
 
     config = {
         'http': {},
@@ -150,7 +58,7 @@ async def test_async_setup_entry_default(hass):
         # no upnp
     }
     with MockDependency('netdisco.discovery'), \
-        patch('homeassistant.components.upnp.config_flow.get_local_ip',
+        patch('homeassistant.components.upnp.get_local_ip',
               return_value='192.168.1.10'):
         await async_setup_component(hass, 'http', config)
         await async_setup_component(hass, 'upnp', config)
@@ -158,17 +66,23 @@ async def test_async_setup_entry_default(hass):
 
     # mock homeassistant.components.upnp.device.Device
     mock_device = MockDevice(udn)
-    with patch.object(Device, 'async_create_device') as create_device:
+    discovery_infos = [{
+        'udn': udn,
+        'ssdp_description': 'http://192.168.1.1/desc.xml',
+    }]
+    with patch.object(Device, 'async_create_device') as create_device, \
+         patch.object(Device, 'async_discover') as async_discover:  # noqa:E125
+
         create_device.return_value = mock_coro(return_value=mock_device)
-        with patch('homeassistant.components.upnp.config_flow.get_local_ip',
-                   return_value='192.168.1.10'):
-            assert await upnp.async_setup_entry(hass, entry) is True
+        async_discover.return_value = mock_coro(return_value=discovery_infos)
 
-            # ensure device is stored/used
-            assert hass.data[upnp.DOMAIN]['devices'][udn] == mock_device
+        assert await upnp.async_setup_entry(hass, entry) is True
 
-            hass.bus.async_fire(EVENT_HOMEASSISTANT_STOP)
-            await hass.async_block_till_done()
+        # ensure device is stored/used
+        assert hass.data[upnp.DOMAIN]['devices'][udn] == mock_device
+
+        hass.bus.async_fire(EVENT_HOMEASSISTANT_STOP)
+        await hass.async_block_till_done()
 
     # ensure no port-mappings created or removed
     assert not mock_device.added_port_mappings
@@ -177,13 +91,9 @@ async def test_async_setup_entry_default(hass):
 
 async def test_async_setup_entry_port_mapping(hass):
     """Test async_setup_entry."""
+    # pylint: disable=invalid-name
     udn = 'uuid:device_1'
-    entry = MockConfigEntry(domain=upnp.DOMAIN, data={
-        'ssdp_description': 'http://192.168.1.1/desc.xml',
-        'udn': udn,
-        'sensors': False,
-        'port_mapping': True,
-    })
+    entry = MockConfigEntry(domain=upnp.DOMAIN)
 
     config = {
         'http': {},
@@ -194,15 +104,22 @@ async def test_async_setup_entry_port_mapping(hass):
         },
     }
     with MockDependency('netdisco.discovery'), \
-        patch('homeassistant.components.upnp.config_flow.get_local_ip',
+        patch('homeassistant.components.upnp.get_local_ip',
               return_value='192.168.1.10'):
         await async_setup_component(hass, 'http', config)
         await async_setup_component(hass, 'upnp', config)
         await hass.async_block_till_done()
 
     mock_device = MockDevice(udn)
-    with patch.object(Device, 'async_create_device') as create_device:
+    discovery_infos = [{
+        'udn': udn,
+        'ssdp_description': 'http://192.168.1.1/desc.xml',
+    }]
+    with patch.object(Device, 'async_create_device') as create_device, \
+         patch.object(Device, 'async_discover') as async_discover:  # noqa:E125
+
         create_device.return_value = mock_coro(return_value=mock_device)
+        async_discover.return_value = mock_coro(return_value=discovery_infos)
 
         assert await upnp.async_setup_entry(hass, entry) is True
 
diff --git a/tests/components/websocket_api/test_auth.py b/tests/components/websocket_api/test_auth.py
index 4c0014e4783..9d2d2ce251e 100644
--- a/tests/components/websocket_api/test_auth.py
+++ b/tests/components/websocket_api/test_auth.py
@@ -132,7 +132,8 @@ async def test_auth_active_with_password_not_allow(hass, aiohttp_client):
         assert auth_msg['type'] == TYPE_AUTH_INVALID
 
 
-async def test_auth_legacy_support_with_password(hass, aiohttp_client):
+async def test_auth_legacy_support_with_password(hass, aiohttp_client,
+                                                 legacy_auth):
     """Test authenticating with a token."""
     assert await async_setup_component(hass, 'websocket_api', {
         'http': {
diff --git a/tests/conftest.py b/tests/conftest.py
index 82ae596fb48..528ad195195 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -142,7 +142,7 @@ def hass_access_token(hass, hass_admin_user):
     """Return an access token to access Home Assistant."""
     refresh_token = hass.loop.run_until_complete(
         hass.auth.async_create_refresh_token(hass_admin_user, CLIENT_ID))
-    yield hass.auth.async_create_access_token(refresh_token)
+    return hass.auth.async_create_access_token(refresh_token)
 
 
 @pytest.fixture
@@ -167,6 +167,14 @@ def hass_read_only_user(hass, local_auth):
     return MockUser(groups=[read_only_group]).add_to_hass(hass)
 
 
+@pytest.fixture
+def hass_read_only_access_token(hass, hass_read_only_user):
+    """Return a Home Assistant read only user."""
+    refresh_token = hass.loop.run_until_complete(
+        hass.auth.async_create_refresh_token(hass_read_only_user, CLIENT_ID))
+    return hass.auth.async_create_access_token(refresh_token)
+
+
 @pytest.fixture
 def legacy_auth(hass):
     """Load legacy API password provider."""
diff --git a/tests/fixtures/london_underground.json b/tests/fixtures/london_underground.json
deleted file mode 100644
index fddae7e89e2..00000000000
--- a/tests/fixtures/london_underground.json
+++ /dev/null
@@ -1,465 +0,0 @@
-[
-  {
-    "$type": "Tfl.Api.Presentation.Entities.Line, Tfl.Api.Presentation.Entities",
-    "id": "bakerloo",
-    "name": "Bakerloo",
-    "modeName": "tube",
-    "disruptions": [],
-    "created": "2017-06-28T11:43:10.703Z",
-    "modified": "2017-06-28T11:43:10.703Z",
-    "lineStatuses": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineStatus, Tfl.Api.Presentation.Entities",
-        "id": 0,
-        "statusSeverity": 10,
-        "statusSeverityDescription": "Good Service",
-        "created": "0001-01-01T00:00:00",
-        "validityPeriods": []
-      }
-    ],
-    "routeSections": [],
-    "serviceTypes": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Regular",
-        "uri": "/Line/Route?ids=Bakerloo&serviceTypes=Regular"
-      }
-    ],
-    "crowding": {
-      "$type": "Tfl.Api.Presentation.Entities.Crowding, Tfl.Api.Presentation.Entities"
-    }
-  },
-  {
-    "$type": "Tfl.Api.Presentation.Entities.Line, Tfl.Api.Presentation.Entities",
-    "id": "central",
-    "name": "Central",
-    "modeName": "tube",
-    "disruptions": [],
-    "created": "2017-06-28T11:43:10.623Z",
-    "modified": "2017-06-28T11:43:10.623Z",
-    "lineStatuses": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineStatus, Tfl.Api.Presentation.Entities",
-        "id": 0,
-        "statusSeverity": 10,
-        "statusSeverityDescription": "Good Service",
-        "created": "0001-01-01T00:00:00",
-        "validityPeriods": []
-      }
-    ],
-    "routeSections": [],
-    "serviceTypes": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Regular",
-        "uri": "/Line/Route?ids=Central&serviceTypes=Regular"
-      },
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Night",
-        "uri": "/Line/Route?ids=Central&serviceTypes=Night"
-      }
-    ],
-    "crowding": {
-      "$type": "Tfl.Api.Presentation.Entities.Crowding, Tfl.Api.Presentation.Entities"
-    }
-  },
-  {
-    "$type": "Tfl.Api.Presentation.Entities.Line, Tfl.Api.Presentation.Entities",
-    "id": "circle",
-    "name": "Circle",
-    "modeName": "tube",
-    "disruptions": [],
-    "created": "2017-06-28T11:43:10.733Z",
-    "modified": "2017-06-28T11:43:10.733Z",
-    "lineStatuses": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineStatus, Tfl.Api.Presentation.Entities",
-        "id": 0,
-        "statusSeverity": 10,
-        "statusSeverityDescription": "Good Service",
-        "created": "0001-01-01T00:00:00",
-        "validityPeriods": []
-      }
-    ],
-    "routeSections": [],
-    "serviceTypes": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Regular",
-        "uri": "/Line/Route?ids=Circle&serviceTypes=Regular"
-      }
-    ],
-    "crowding": {
-      "$type": "Tfl.Api.Presentation.Entities.Crowding, Tfl.Api.Presentation.Entities"
-    }
-  },
-  {
-    "$type": "Tfl.Api.Presentation.Entities.Line, Tfl.Api.Presentation.Entities",
-    "id": "district",
-    "name": "District",
-    "modeName": "tube",
-    "disruptions": [],
-    "created": "2017-06-28T11:43:10.623Z",
-    "modified": "2017-06-28T11:43:10.623Z",
-    "lineStatuses": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineStatus, Tfl.Api.Presentation.Entities",
-        "id": 0,
-        "statusSeverity": 10,
-        "statusSeverityDescription": "Good Service",
-        "created": "0001-01-01T00:00:00",
-        "validityPeriods": []
-      }
-    ],
-    "routeSections": [],
-    "serviceTypes": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Regular",
-        "uri": "/Line/Route?ids=District&serviceTypes=Regular"
-      }
-    ],
-    "crowding": {
-      "$type": "Tfl.Api.Presentation.Entities.Crowding, Tfl.Api.Presentation.Entities"
-    }
-  },
-  {
-    "$type": "Tfl.Api.Presentation.Entities.Line, Tfl.Api.Presentation.Entities",
-    "id": "dlr",
-    "name": "DLR",
-    "modeName": "dlr",
-    "disruptions": [],
-    "created": "2017-06-28T11:43:10.703Z",
-    "modified": "2017-06-28T11:43:10.703Z",
-    "lineStatuses": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineStatus, Tfl.Api.Presentation.Entities",
-        "id": 0,
-        "statusSeverity": 10,
-        "statusSeverityDescription": "Good Service",
-        "created": "0001-01-01T00:00:00",
-        "validityPeriods": []
-      }
-    ],
-    "routeSections": [],
-    "serviceTypes": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Regular",
-        "uri": "/Line/Route?ids=DLR&serviceTypes=Regular"
-      }
-    ],
-    "crowding": {
-      "$type": "Tfl.Api.Presentation.Entities.Crowding, Tfl.Api.Presentation.Entities"
-    }
-  },
-  {
-    "$type": "Tfl.Api.Presentation.Entities.Line, Tfl.Api.Presentation.Entities",
-    "id": "hammersmith-city",
-    "name": "Hammersmith & City",
-    "modeName": "tube",
-    "disruptions": [],
-    "created": "2017-06-28T11:43:10.67Z",
-    "modified": "2017-06-28T11:43:10.67Z",
-    "lineStatuses": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineStatus, Tfl.Api.Presentation.Entities",
-        "id": 0,
-        "statusSeverity": 10,
-        "statusSeverityDescription": "Good Service",
-        "created": "0001-01-01T00:00:00",
-        "validityPeriods": []
-      }
-    ],
-    "routeSections": [],
-    "serviceTypes": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Regular",
-        "uri": "/Line/Route?ids=Hammersmith & City&serviceTypes=Regular"
-      }
-    ],
-    "crowding": {
-      "$type": "Tfl.Api.Presentation.Entities.Crowding, Tfl.Api.Presentation.Entities"
-    }
-  },
-  {
-    "$type": "Tfl.Api.Presentation.Entities.Line, Tfl.Api.Presentation.Entities",
-    "id": "jubilee",
-    "name": "Jubilee",
-    "modeName": "tube",
-    "disruptions": [],
-    "created": "2017-06-28T11:43:10.623Z",
-    "modified": "2017-06-28T11:43:10.623Z",
-    "lineStatuses": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineStatus, Tfl.Api.Presentation.Entities",
-        "id": 0,
-        "statusSeverity": 10,
-        "statusSeverityDescription": "Good Service",
-        "created": "0001-01-01T00:00:00",
-        "validityPeriods": []
-      }
-    ],
-    "routeSections": [],
-    "serviceTypes": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Regular",
-        "uri": "/Line/Route?ids=Jubilee&serviceTypes=Regular"
-      },
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Night",
-        "uri": "/Line/Route?ids=Jubilee&serviceTypes=Night"
-      }
-    ],
-    "crowding": {
-      "$type": "Tfl.Api.Presentation.Entities.Crowding, Tfl.Api.Presentation.Entities"
-    }
-  },
-  {
-    "$type": "Tfl.Api.Presentation.Entities.Line, Tfl.Api.Presentation.Entities",
-    "id": "london-overground",
-    "name": "London Overground",
-    "modeName": "overground",
-    "disruptions": [],
-    "created": "2017-06-28T11:43:10.607Z",
-    "modified": "2017-06-28T11:43:10.607Z",
-    "lineStatuses": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineStatus, Tfl.Api.Presentation.Entities",
-        "id": 0,
-        "lineId": "london-overground",
-        "statusSeverity": 9,
-        "statusSeverityDescription": "Minor Delays",
-        "reason": "something",
-        "created": "0001-01-01T00:00:00",
-        "validityPeriods": [
-          {
-            "$type": "Tfl.Api.Presentation.Entities.ValidityPeriod, Tfl.Api.Presentation.Entities",
-            "fromDate": "2017-06-29T06:27:21Z",
-            "toDate": "2017-06-30T01:29:00Z",
-            "isNow": true
-          }
-        ],
-        "disruption": {
-          "$type": "Tfl.Api.Presentation.Entities.Disruption, Tfl.Api.Presentation.Entities",
-          "category": "RealTime",
-          "categoryDescription": "RealTime",
-          "description": "London Overground: Minor delays Richmond to Stratford and Willesden Junction to Clapham Junction while we fix a faulty train at Richmond, GOOD SERVICE all other routes. ",
-          "affectedRoutes": [],
-          "affectedStops": [],
-          "closureText": "minorDelays"
-        }
-      }
-    ],
-    "routeSections": [],
-    "serviceTypes": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Regular",
-        "uri": "/Line/Route?ids=London Overground&serviceTypes=Regular"
-      }
-    ],
-    "crowding": {
-      "$type": "Tfl.Api.Presentation.Entities.Crowding, Tfl.Api.Presentation.Entities"
-    }
-  },
-  {
-    "$type": "Tfl.Api.Presentation.Entities.Line, Tfl.Api.Presentation.Entities",
-    "id": "metropolitan",
-    "name": "Metropolitan",
-    "modeName": "tube",
-    "disruptions": [],
-    "created": "2017-06-28T11:43:10.703Z",
-    "modified": "2017-06-28T11:43:10.703Z",
-    "lineStatuses": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineStatus, Tfl.Api.Presentation.Entities",
-        "id": 0,
-        "statusSeverity": 10,
-        "statusSeverityDescription": "Good Service",
-        "created": "0001-01-01T00:00:00",
-        "validityPeriods": []
-      }
-    ],
-    "routeSections": [],
-    "serviceTypes": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Regular",
-        "uri": "/Line/Route?ids=Metropolitan&serviceTypes=Regular"
-      }
-    ],
-    "crowding": {
-      "$type": "Tfl.Api.Presentation.Entities.Crowding, Tfl.Api.Presentation.Entities"
-    }
-  },
-  {
-    "$type": "Tfl.Api.Presentation.Entities.Line, Tfl.Api.Presentation.Entities",
-    "id": "northern",
-    "name": "Northern",
-    "modeName": "tube",
-    "disruptions": [],
-    "created": "2017-06-28T11:43:10.67Z",
-    "modified": "2017-06-28T11:43:10.67Z",
-    "lineStatuses": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineStatus, Tfl.Api.Presentation.Entities",
-        "id": 0,
-        "statusSeverity": 10,
-        "statusSeverityDescription": "Good Service",
-        "created": "0001-01-01T00:00:00",
-        "validityPeriods": []
-      }
-    ],
-    "routeSections": [],
-    "serviceTypes": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Regular",
-        "uri": "/Line/Route?ids=Northern&serviceTypes=Regular"
-      },
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Night",
-        "uri": "/Line/Route?ids=Northern&serviceTypes=Night"
-      }
-    ],
-    "crowding": {
-      "$type": "Tfl.Api.Presentation.Entities.Crowding, Tfl.Api.Presentation.Entities"
-    }
-  },
-  {
-    "$type": "Tfl.Api.Presentation.Entities.Line, Tfl.Api.Presentation.Entities",
-    "id": "piccadilly",
-    "name": "Piccadilly",
-    "modeName": "tube",
-    "disruptions": [],
-    "created": "2017-06-28T11:43:10.67Z",
-    "modified": "2017-06-28T11:43:10.67Z",
-    "lineStatuses": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineStatus, Tfl.Api.Presentation.Entities",
-        "id": 0,
-        "statusSeverity": 10,
-        "statusSeverityDescription": "Good Service",
-        "created": "0001-01-01T00:00:00",
-        "validityPeriods": []
-      }
-    ],
-    "routeSections": [],
-    "serviceTypes": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Regular",
-        "uri": "/Line/Route?ids=Piccadilly&serviceTypes=Regular"
-      },
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Night",
-        "uri": "/Line/Route?ids=Piccadilly&serviceTypes=Night"
-      }
-    ],
-    "crowding": {
-      "$type": "Tfl.Api.Presentation.Entities.Crowding, Tfl.Api.Presentation.Entities"
-    }
-  },
-  {
-    "$type": "Tfl.Api.Presentation.Entities.Line, Tfl.Api.Presentation.Entities",
-    "id": "tfl-rail",
-    "name": "TfL Rail",
-    "modeName": "tflrail",
-    "disruptions": [],
-    "created": "2017-06-28T11:43:10.657Z",
-    "modified": "2017-06-28T11:43:10.657Z",
-    "lineStatuses": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineStatus, Tfl.Api.Presentation.Entities",
-        "id": 0,
-        "statusSeverity": 10,
-        "statusSeverityDescription": "Good Service",
-        "created": "0001-01-01T00:00:00",
-        "validityPeriods": []
-      }
-    ],
-    "routeSections": [],
-    "serviceTypes": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Regular",
-        "uri": "/Line/Route?ids=TfL Rail&serviceTypes=Regular"
-      }
-    ],
-    "crowding": {
-      "$type": "Tfl.Api.Presentation.Entities.Crowding, Tfl.Api.Presentation.Entities"
-    }
-  },
-  {
-    "$type": "Tfl.Api.Presentation.Entities.Line, Tfl.Api.Presentation.Entities",
-    "id": "victoria",
-    "name": "Victoria",
-    "modeName": "tube",
-    "disruptions": [],
-    "created": "2017-06-28T11:43:10.607Z",
-    "modified": "2017-06-28T11:43:10.607Z",
-    "lineStatuses": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineStatus, Tfl.Api.Presentation.Entities",
-        "id": 0,
-        "statusSeverity": 10,
-        "statusSeverityDescription": "Good Service",
-        "created": "0001-01-01T00:00:00",
-        "validityPeriods": []
-      }
-    ],
-    "routeSections": [],
-    "serviceTypes": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Regular",
-        "uri": "/Line/Route?ids=Victoria&serviceTypes=Regular"
-      },
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Night",
-        "uri": "/Line/Route?ids=Victoria&serviceTypes=Night"
-      }
-    ],
-    "crowding": {
-      "$type": "Tfl.Api.Presentation.Entities.Crowding, Tfl.Api.Presentation.Entities"
-    }
-  },
-  {
-    "$type": "Tfl.Api.Presentation.Entities.Line, Tfl.Api.Presentation.Entities",
-    "id": "waterloo-city",
-    "name": "Waterloo & City",
-    "modeName": "tube",
-    "disruptions": [],
-    "created": "2017-06-28T11:43:10.703Z",
-    "modified": "2017-06-28T11:43:10.703Z",
-    "lineStatuses": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineStatus, Tfl.Api.Presentation.Entities",
-        "id": 0,
-        "statusSeverity": 10,
-        "statusSeverityDescription": "Good Service",
-        "created": "0001-01-01T00:00:00",
-        "validityPeriods": []
-      }
-    ],
-    "routeSections": [],
-    "serviceTypes": [
-      {
-        "$type": "Tfl.Api.Presentation.Entities.LineServiceTypeInfo, Tfl.Api.Presentation.Entities",
-        "name": "Regular",
-        "uri": "/Line/Route?ids=Waterloo & City&serviceTypes=Regular"
-      }
-    ],
-    "crowding": {
-      "$type": "Tfl.Api.Presentation.Entities.Crowding, Tfl.Api.Presentation.Entities"
-    }
-  }
-]
diff --git a/tests/helpers/test_config_validation.py b/tests/helpers/test_config_validation.py
index cfd84dbc3b3..412882f0a01 100644
--- a/tests/helpers/test_config_validation.py
+++ b/tests/helpers/test_config_validation.py
@@ -584,3 +584,16 @@ def test_is_regex():
 
     valid_re = ".*"
     schema(valid_re)
+
+
+def test_comp_entity_ids():
+    """Test config validation for component entity IDs."""
+    schema = vol.Schema(cv.comp_entity_ids)
+
+    for valid in ('ALL', 'all', 'AlL', 'light.kitchen', ['light.kitchen'],
+                  ['light.kitchen', 'light.ceiling'], []):
+        schema(valid)
+
+    for invalid in (['light.kitchen', 'not-entity-id'], '*', ''):
+        with pytest.raises(vol.Invalid):
+            schema(invalid)
diff --git a/tests/helpers/test_entity.py b/tests/helpers/test_entity.py
index a51787225ca..d79f84d416d 100644
--- a/tests/helpers/test_entity.py
+++ b/tests/helpers/test_entity.py
@@ -33,14 +33,6 @@ def test_generate_entity_id_given_keys():
             'test.another_entity']) == 'test.overwrite_hidden_true'
 
 
-def test_generate_entity_id_with_nonlatin_name():
-    """Test generate_entity_id given a name containing non-latin characters."""
-    fmt = 'test.{}'
-    assert entity.generate_entity_id(
-        fmt, 'ホームアシスタント', current_ids=[]
-    ) == 'test.unnamed_device'
-
-
 def test_async_update_support(hass):
     """Test async update getting called."""
     sync_update = []
diff --git a/tests/helpers/test_entity_component.py b/tests/helpers/test_entity_component.py
index 7562a38d268..8f54f0ee5bc 100644
--- a/tests/helpers/test_entity_component.py
+++ b/tests/helpers/test_entity_component.py
@@ -452,3 +452,37 @@ async def test_set_service_race(hass):
 
     await hass.async_block_till_done()
     assert not exception
+
+
+async def test_extract_all_omit_entity_id(hass, caplog):
+    """Test extract all with None and *."""
+    component = EntityComponent(_LOGGER, DOMAIN, hass)
+    await component.async_add_entities([
+        MockEntity(name='test_1'),
+        MockEntity(name='test_2'),
+    ])
+
+    call = ha.ServiceCall('test', 'service')
+
+    assert ['test_domain.test_1', 'test_domain.test_2'] == \
+        sorted(ent.entity_id for ent in
+               component.async_extract_from_service(call))
+    assert ('Not passing an entity ID to a service to target all entities is '
+            'deprecated') in caplog.text
+
+
+async def test_extract_all_use_match_all(hass, caplog):
+    """Test extract all with None and *."""
+    component = EntityComponent(_LOGGER, DOMAIN, hass)
+    await component.async_add_entities([
+        MockEntity(name='test_1'),
+        MockEntity(name='test_2'),
+    ])
+
+    call = ha.ServiceCall('test', 'service', {'entity_id': '*'})
+
+    assert ['test_domain.test_1', 'test_domain.test_2'] == \
+        sorted(ent.entity_id for ent in
+               component.async_extract_from_service(call))
+    assert ('Not passing an entity ID to a service to target all entities is '
+            'deprecated') not in caplog.text
diff --git a/tests/helpers/test_script.py b/tests/helpers/test_script.py
index 887a147c417..d04044d9b60 100644
--- a/tests/helpers/test_script.py
+++ b/tests/helpers/test_script.py
@@ -4,6 +4,7 @@ from datetime import timedelta
 from unittest import mock
 import unittest
 
+import jinja2
 import voluptuous as vol
 import pytest
 
@@ -798,6 +799,7 @@ async def test_propagate_error_service_not_found(hass):
         await script_obj.async_run()
 
     assert len(events) == 0
+    assert script_obj._cur == -1
 
 
 async def test_propagate_error_invalid_service_data(hass):
@@ -829,6 +831,7 @@ async def test_propagate_error_invalid_service_data(hass):
 
     assert len(events) == 0
     assert len(calls) == 0
+    assert script_obj._cur == -1
 
 
 async def test_propagate_error_service_exception(hass):
@@ -859,3 +862,35 @@ async def test_propagate_error_service_exception(hass):
 
     assert len(events) == 0
     assert len(calls) == 0
+    assert script_obj._cur == -1
+
+
+def test_log_exception():
+    """Test logged output."""
+    script_obj = script.Script(None, cv.SCRIPT_SCHEMA([
+        {'service': 'test.script'},
+        {'event': 'test_event'}]))
+    script_obj._exception_step = 1
+
+    for exc, msg in (
+        (vol.Invalid("Invalid number"), 'Invalid data'),
+        (exceptions.TemplateError(jinja2.TemplateError('Unclosed bracket')),
+         'Error rendering template'),
+        (exceptions.Unauthorized(), 'Unauthorized'),
+        (exceptions.ServiceNotFound('light', 'turn_on'), 'Service not found'),
+        (ValueError("Cannot parse JSON"), 'Unknown error'),
+    ):
+        logger = mock.Mock()
+        script_obj.async_log_exception(logger, 'Test error', exc)
+
+        assert len(logger.mock_calls) == 1
+        p_format, p_msg_base, p_error_desc, p_action_type, p_step, p_error = \
+            logger.mock_calls[0][1]
+
+        assert p_error_desc == msg
+        assert p_action_type == script.ACTION_FIRE_EVENT
+        assert p_step == 2
+        if isinstance(exc, ValueError):
+            assert p_error == ""
+        else:
+            assert p_error == str(exc)
diff --git a/tests/helpers/test_service.py b/tests/helpers/test_service.py
index 8fca7df69c1..35e89fc5218 100644
--- a/tests/helpers/test_service.py
+++ b/tests/helpers/test_service.py
@@ -306,3 +306,35 @@ async def test_call_no_context_target_specific(
     assert len(mock_service_platform_call.mock_calls) == 1
     entities = mock_service_platform_call.mock_calls[0][1][2]
     assert entities == [mock_entities['light.kitchen']]
+
+
+async def test_call_with_match_all(hass, mock_service_platform_call,
+                                   mock_entities, caplog):
+    """Check we only target allowed entities if targetting all."""
+    await service.entity_service_call(hass, [
+        Mock(entities=mock_entities)
+    ], Mock(), ha.ServiceCall('test_domain', 'test_service', {
+        'entity_id': 'all'
+    }))
+
+    assert len(mock_service_platform_call.mock_calls) == 1
+    entities = mock_service_platform_call.mock_calls[0][1][2]
+    assert entities == [
+        mock_entities['light.kitchen'], mock_entities['light.living_room']]
+    assert ('Not passing an entity ID to a service to target '
+            'all entities is deprecated') not in caplog.text
+
+
+async def test_call_with_omit_entity_id(hass, mock_service_platform_call,
+                                        mock_entities, caplog):
+    """Check we only target allowed entities if targetting all."""
+    await service.entity_service_call(hass, [
+        Mock(entities=mock_entities)
+    ], Mock(), ha.ServiceCall('test_domain', 'test_service'))
+
+    assert len(mock_service_platform_call.mock_calls) == 1
+    entities = mock_service_platform_call.mock_calls[0][1][2]
+    assert entities == [
+        mock_entities['light.kitchen'], mock_entities['light.living_room']]
+    assert ('Not passing an entity ID to a service to target '
+            'all entities is deprecated') in caplog.text
diff --git a/tests/util/test_init.py b/tests/util/test_init.py
index 10b4fe0ad8c..98fe8774b96 100644
--- a/tests/util/test_init.py
+++ b/tests/util/test_init.py
@@ -27,17 +27,19 @@ class TestUtil(unittest.TestCase):
 
     def test_slugify(self):
         """Test slugify."""
-        assert "test" == util.slugify("T-!@#$!#@$!$est")
+        assert "t_est" == util.slugify("T-!@#$!#@$!$est")
         assert "test_more" == util.slugify("Test More")
         assert "test_more" == util.slugify("Test_(More)")
         assert "test_more" == util.slugify("Tèst_Mörê")
-        assert "b827eb000000" == util.slugify("B8:27:EB:00:00:00")
-        assert "testcom" == util.slugify("test.com")
-        assert "greg_phone__exp_wayp1" == \
+        assert "b8_27_eb_00_00_00" == util.slugify("B8:27:EB:00:00:00")
+        assert "test_com" == util.slugify("test.com")
+        assert "greg_phone_exp_wayp1" == \
             util.slugify("greg_phone - exp_wayp1")
         assert "we_are_we_are_a_test_calendar" == \
             util.slugify("We are, we are, a... Test Calendar")
         assert "test_aouss_aou" == util.slugify("Tèst_äöüß_ÄÖÜ")
+        assert "ying_shi_ma" == util.slugify("影師嗎")
+        assert "keihuonto" == util.slugify("けいふぉんと")
 
     def test_repr_helper(self):
         """Test repr_helper."""