saltstack/salt — pull request #15473 by thatch45 (2014-09-03 14:48:27+00:00)
Title: Merge #15458 with lint fix

Merge #15458 with lint fix