saltstack/salt — pull request #17231 by thatch45 (2014-11-06 17:55:59+00:00)
Title: Merge #17169

Merge #17169 with minor fix