saltstack/salt — pull request #17038 by rallytime (2014-10-30 16:17:49+00:00)
Title: Backport #16980 to 2014.7

Backport #16980 to 2014.7