saltstack/salt — pull request #15989 by rallytime (2014-09-19 22:07:25+00:00)
Title: Backport #15598 to 2014.7

Backport #15598 to 2014.7