saltstack/salt — pull request #17212 by rallytime (2014-11-05 22:15:08+00:00)
Title: Backport #17183 to 2014.7

Backport #17183 to 2014.7