saltstack/salt — pull request #16624 by rallytime (2014-10-14 16:05:26+00:00)
Title: Backport #15036 to 2014.7

Backport #15036 to 2014.7