saltstack/salt — pull request #18895 by rallytime (2014-12-10 22:55:34+00:00)
Title: Backport #18712 to 2014.7

Backport #18712 to 2014.7