saltstack/salt — pull request #15972 by rallytime (2014-09-19 16:15:56+00:00)
Title: Backport #15775 to 2014.7

Backport #15775 to 2014.7