saltstack/salt — pull request #16361 by rallytime (2014-10-03 19:01:05+00:00)
Title: Backport #15584 to 2014.7

Backport #15584 to 2014.7

Fixes #16307