saltstack/salt — pull request #16186 by rallytime (2014-09-26 18:53:02+00:00)
Title: Backport #16077 to 2014.7

Backport #16077 to 2014.7