saltstack/salt — pull request #16231 by rallytime (2014-09-29 18:22:05+00:00)
Title: Backport #16144 to 2014.7

Backport #16144 to 2014.7