saltstack/salt — pull request #9081 by jcsp (2013-12-06 16:05:41+00:00)
Title: 8263 mitigation

This pull request includes two changes to reduce the chances of hitting issue #8263.