saltstack/salt — pull request #16498 by rallytime (2014-10-08 23:00:01+00:00)
Title: Backport #16452 to 2014.7

Backport #16452 to 2014.7