saltstack/salt — pull request #16351 by thatch45 (2014-10-03 15:57:57+00:00)
Title: Merge #16338

Merge #16338 with lint fixes