saltstack/salt — pull request #17252 by rallytime (2014-11-06 22:31:19+00:00)
Title: Backport #17231 to 2014.7

Backport #17231 to 2014.7