primitive.py: Bring in the scheduling fix from stable branch for the moment.
primitive.py: Bring in the scheduling fix from stable branch for the moment.


git-svn-id: bf82309ee31681273af20a825c7064ea7c5af838@1099841 13f79535-47bb-0310-9956-ffa450edef68

stroucki/tashi,stroucki/tashi,stroucki/tashi