Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	python.d/python_modules/base.py
#	python.d/redis.chart.py

diff --cc python.d/python_modules/base.py
index 8940b8731a128fadd4ce86fc4ba6b654dc9676be,aa89b223e31811f5413ccb25395714623b61df82..5077e9995e3bf652d3dffebebed83556fec95807
--- 1/python.d/python_modules/base.py
--- 2/python.d/python_modules/base.py
+++ b/python.d/python_modules/base.py
@@@ -692,7 -692,7 +692,11 @@@ class SocketService(SimpleService)
                  break
  
              self.debug("received data:", str(buf))
++<<<<<<< HEAD
 +            data += buf.decode('utf-8', 'ignore')
++=======
+             data += buf.decode(errors='ignore')
++>>>>>>> upstream/master
              if self._check_raw_data(data):
                  break
  

diff --cc python.d/redis.chart.py
index 56561ee095453748bbaf24fe82dce87215110d3d,b23160be44eb800beb9eedf5c520da180bff5002..7ed343de497a9eb281d9e0e48c958229aa0beb1f
--- 1/python.d/redis.chart.py
--- 2/python.d/redis.chart.py
+++ b/python.d/redis.chart.py
@@@ -99,15 -92,6 +99,18 @@@ class Service(SocketService)
          Get data from socket
          :return: dict
          """
++<<<<<<< HEAD
 +        if self.passwd:
 +            info_request = self.request
 +            self.request = "AUTH " + self.passwd + "\r\n"
 +            raw = self._get_raw_data().strip()
 +            if raw != "+OK":
 +                self.error("invalid password")
 +                return None
 +            self.request = info_request
 +
++=======
++>>>>>>> upstream/master
          response = self._get_raw_data()
          if response is None:
              # error has already been logged