saltstack/salt — pull request #16895 by rallytime (2014-10-24 22:43:11+00:00)
Title: Backport #16797 to 2014.7

Backport #16797 to 2014.7