saltstack/salt — pull request #16272 by rallytime (2014-09-30 16:52:41+00:00)
Title: Backport #16252 to 2014.7

Backport #16252 to 2014.7