saltstack/salt — pull request #15953 by rallytime (2014-09-19 02:26:11+00:00)
Title: Backport #15148 to 2014.7

Backport #15148 to 2014.7