saltstack/salt — pull request #18870 by rallytime (2014-12-09 23:57:51+00:00)
Title: Backport #18498 to 2014.1

Backport #18498 to 2014.1

Conflicts:
salt/modules/virtualenv_mod.py