Compat. versions py3 & zc.buildout install
Merge branch 'p' into develop

Conflicts:
	salt/version.py