saltstack/salt — pull request #19093 by thatch45 (2014-12-18 17:08:14+00:00)
Title: Merge #19089

Merge #19089 with lint fixes