saltstack/salt — pull request #18916 by rallytime (2014-12-11 17:24:19+00:00)
Title: Backport #18776 to 2014.1

Backport #18776 to 2014.1