saltstack/salt — pull request #18977 by rallytime (2014-12-13 18:10:57+00:00)
Title: Backport #18771 to 2014.1

Backport #18771 to 2014.1