saltstack/salt — pull request #18819 by rallytime (2014-12-08 22:14:19+00:00)
Title: Backport #18222 to 2014.1

Backport #18222 to 2014.1