saltstack/salt — pull request #17148 by thatch45 (2014-11-04 16:21:47+00:00)
Title: Merge #17143

Merge #17143 with fixes