saltstack/salt — pull request #16602 by rallytime (2014-10-13 21:33:14+00:00)
Title: Backport #16572 to 2014.7

Backport #16572 to 2014.7