saltstack/salt — pull request #15985 by rallytime (2014-09-19 21:42:37+00:00)
Title: Backport #15915 to 2014.7

Backport #15915 to 2014.7