saltstack/salt — pull request #16663 by rallytime (2014-10-15 21:21:44+00:00)
Title: Backport #15848 to 2014.1

Backport #15848 to 2014.1