change dir-locals for pyvenv
Merge branch 'master' into develop
setup.py: try to fix error with travis on python 2.6