Backport #18498 to 2014.1

Backport #18498 to 2014.1

Conflicts:
	salt/modules/virtualenv_mod.py