saltstack/salt — pull request #19228 by rallytime (2014-12-23 18:37:34+00:00)
Title: Backport #19154 to 2014.7

Backport #19154 to 2014.7