saltstack/salt — pull request #16029 by thatch45 (2014-09-22 16:52:31+00:00)
Title: Merge #15980

Fixes for #15980, just lint, thanks for the addition @lomeroe!