saltstack/salt — pull request #18887 by rallytime (2014-12-10 20:15:42+00:00)
Title: Backport #18161 to 2014.1

Backport #18161 to 2014.1