saltstack/salt — pull request #15954 by rallytime (2014-09-19 02:37:01+00:00)
Title: Backport #15619 to 2014.7

Backport #15619 to 2014.7