saltstack/salt — pull request #15956 by rallytime (2014-09-19 02:41:54+00:00)
Title: Backport #15676 to 2014.7

Backport #15676 to 2014.7