Merge branch 'use-generic-variables' of git://github.com/cipy/enviroplus-python into...