saltstack/salt — pull request #18898 by rallytime (2014-12-11 00:15:37+00:00)
Title: Backport #18340 to 2014.1

Backport #18340 to 2014.1