saltstack/salt — pull request #16893 by rallytime (2014-10-24 22:30:26+00:00)
Title: Backport #16813 to 2014.7

Backport #16813 to 2014.7