saltstack/salt — pull request #18893 by rallytime (2014-12-10 22:51:16+00:00)
Title: Backport #18706 to 2014.7

Backport #18706 to 2014.7