saltstack/salt — pull request #17247 by rallytime (2014-11-06 22:08:10+00:00)
Title: Backport #17188 to 2014.7

Backport #17188 to 2014.7