saltstack/salt — pull request #16156 by rallytime (2014-09-25 19:22:25+00:00)
Title: Backport #16035 to 2014.7

Backport #16035 to 2014.7