saltstack/salt — pull request #18336 by wuxxin (2014-11-20 19:07:13+00:00)
Title: fixes #18331

@rallytime as requested,

best regards,
wuxxin