saltstack/salt — pull request #17246 by rallytime (2014-11-06 22:06:15+00:00)
Title: Backport #17172 to 2014.7

Backport #17172 to 2014.7