saltstack/salt — pull request #16032 by rallytime (2014-09-22 17:27:13+00:00)
Title: Backport #15967 to 2014.7

Backport #15967 to 2014.7