saltstack/salt — pull request #16249 by rallytime (2014-09-29 22:22:03+00:00)
Title: Backport #16236 to 2014.7

Backport #16236 to 2014.7