saltstack/salt — pull request #16664 by cachedout (2014-10-15 22:12:41+00:00)
Title: Issue 16651

Please hold for merge until reviewed by either @thatch45 or @s0undt3ch