saltstack/salt — pull request #17249 by rallytime (2014-11-06 22:12:58+00:00)
Title: Backport #17224 to 2014.7

Backport #17224 to 2014.7