saltstack/salt — pull request #17035 by thatch45 (2014-10-30 16:06:56+00:00)
Title: Merge #16906 with fixes

Just lint
Merge #16906