saltstack/salt — pull request #15988 by rallytime (2014-09-19 21:48:01+00:00)
Title: Backport #15919 to 2014.7

Backport #15919 to 2014.7