saltstack/salt — pull request #17036 by rallytime (2014-10-30 16:14:18+00:00)
Title: Backport #16965 to 2014.7

Backport #16965 to 2014.7