Merge remote-tracking branch 'upstream/master'

diff --cc python.d/Makefile.am
index 29d4bd9447abb2144630893e2f7b7db2b81febfd,f10b8e91adae27f3aec4dfd804d4447664183406..8c84254b8f93af846b8367939938e9d56b782add
--- 1/python.d/Makefile.am
--- 2/python.d/Makefile.am
+++ b/python.d/Makefile.am
@@@ -4,10 -4,6 +4,10 @@@ dist_python_SCRIPTS = 
        example.chart.py \
        $(NULL)
  
- dist_charts_DATA = \
+ dist_python_DATA = \
        README.md \
        $(NULL)
 +
 +pythonmodulesdir=$(pythondir)/python_modules
 +dist_pythonmodules_DATA = \
 +      $(NULL)