saltstack/salt — pull request #19139 by rallytime (2014-12-19 20:56:33+00:00)
Title: Backport #19051 to 2014.7

Backport #19051 to 2014.7