saltstack/salt — pull request #15952 by rallytime (2014-09-19 00:22:02+00:00)
Title: Backport #15807 to 2014.7

Backport #15807 to 2014.7