saltstack/salt — pull request #16896 by thatch45 (2014-10-24 22:46:53+00:00)
Title: Merge #16889 with fixes

This should fix the salt-ssh break that #16889 introduces