saltstack/salt — pull request #16716 by rallytime (2014-10-17 15:41:25+00:00)
Title: Backport #16613 to 2014.7

Backport #16613 to 2014.7