saltstack/salt — pull request #15974 by rallytime (2014-09-19 16:35:04+00:00)
Title: Backport #15826 to 2014.7

Backport #15826 to 2014.7