saltstack/salt — pull request #16759 by thatch45 (2014-10-20 18:45:19+00:00)
Title: Fix #16504

This is a deep fix, we need to test it thoroghly