saltstack/salt — pull request #15991 by rallytime (2014-09-19 22:32:52+00:00)
Title: Backport #15600 to 2014.7

Backport #15600 to 2014.7