saltstack/salt — pull request #16297 by thatch45 (2014-10-01 19:44:16+00:00)
Title: Merge #16280

Merge #16280, it had some conflicts