saltstack/salt — pull request #16193 by thatch45 (2014-09-26 22:09:30+00:00)
Title: Merge #16177

Merge #16177