saltstack/salt — pull request #18967 by rallytime (2014-12-12 22:08:56+00:00)
Title: Backport #18296 to 2014.1

Backport #18296 to 2014.1