saltstack/salt — pull request #18818 by rallytime (2014-12-08 22:03:18+00:00)
Title: Backport #18297 to 2014.1

Backport #18297 to 2014.1