saltstack/salt — pull request #15992 by rallytime (2014-09-19 22:36:38+00:00)
Title: Backport #15617 to 2014.7

Backport #15617 to 2014.7