saltstack/salt — pull request #18233 by basepi (2014-11-18 21:45:59+00:00)
Title: Backport #17243 to 2014.1

Backport #17243 to 2014.1