saltstack/salt — pull request #16890 by rallytime (2014-10-24 21:57:21+00:00)
Title: Backport #16798 to 2014.7

Backport #16798 to 2014.7