saltstack/salt — pull request #15987 by rallytime (2014-09-19 21:45:59+00:00)
Title: Backport #15916 to 2014.7

Backport #15916 to 2014.7