saltstack/salt — pull request #19135 by rallytime (2014-12-19 20:35:44+00:00)
Title: Backport #18915 to 2014.7

Backport #18915 to 2014.7