saltstack/salt — pull request #16891 by rallytime (2014-10-24 22:00:37+00:00)
Title: Backport #16809 to 2014.7

Backport #16809 to 2014.7