saltstack/salt — pull request #19138 by rallytime (2014-12-19 20:53:10+00:00)
Title: Backport #18915 to 2014.1

Backport #18915 to 2014.1