saltstack/salt — pull request #19229 by rallytime (2014-12-23 18:40:43+00:00)
Title: Backport #19221 to 2015.2

Backport #19221 to 2015.2