saltstack/salt — pull request #17131 by thatch45 (2014-11-04 04:00:33+00:00)
Title: Merge #17111 with fixes

Fix up lint in the AWESOME #17111 PR