saltstack/salt — pull request #16031 by rallytime (2014-09-22 17:17:31+00:00)
Title: Backport #16008 to 2014.7

Backport #16008 to 2014.7