saltstack/salt — pull request #18926 by rallytime (2014-12-11 20:03:58+00:00)
Title: Backport #18807 to 2014.7

Backport #18807 to 2014.7