saltstack/salt — pull request #18987 by rallytime (2014-12-15 02:13:49+00:00)
Title: Backport #18218 to 2014.1

Backport #18218 to 2014.1