saltstack/salt — pull request #17037 by rallytime (2014-10-30 16:16:13+00:00)
Title: Backport #16932 to 2014.7

Backport #16932 to 2014.7