saltstack/salt — pull request #18802 by rallytime (2014-12-08 18:51:53+00:00)
Title: Backport #18147 to 2014.1

Backport #18147 to 2014.1