saltstack/salt — pull request #15868 by rallytime (2014-09-17 15:31:10+00:00)
Title: Backport f8177149

Fixes #15702