saltstack/salt — pull request #16324 by thusoy (2014-10-02 14:10:09+00:00)
Title: Fixes

Small stuff I found while fixing other issues.