saltstack/salt — pull request #16596 by rallytime (2014-10-13 17:43:58+00:00)
Title: Backport #16501 to 2014.7

Backport #16501 to 2014.7