saltstack/salt — pull request #15975 by rallytime (2014-09-19 16:36:16+00:00)
Title: Backport #15877 to 2014.7

Backport #15877 to 2014.7