saltstack/salt — pull request #18855 by rallytime (2014-12-09 20:37:31+00:00)
Title: Backport #18275 to 2014.1

Backport #18275 to 2014.1