saltstack/salt — pull request #15990 by rallytime (2014-09-19 22:21:34+00:00)
Title: Backport #15739 to 2014.7

Backport #15739 to 2014.7