saltstack/salt — pull request #16562 by rallytime (2014-10-10 22:58:30+00:00)
Title: Backport #16559 to 2014.7

Backport #16559 to 2014.7