saltstack/salt — pull request #9695 by UtahDave (2014-01-10 23:25:47+00:00)
Title: Check for proper imports. These were causing stacktraces on Windows.

@basepi, please cherry pick to 0.17 and the RC