saltstack/salt — pull request #16595 by rallytime (2014-10-13 17:30:31+00:00)
Title: Backport #16420 to 2014.7

Backport #16420 to 2014.7