saltstack/salt — pull request #16662 by rallytime (2014-10-15 21:11:46+00:00)
Title: Backport #16648 to 2014.7

Backport #16648 to 2014.7