saltstack/salt — pull request #16300 by thatch45 (2014-10-01 21:05:52+00:00)
Title: Merge #16295

Merge #16295