I actually think that you broke this when ripping out all the weird cursor stuff and mutex nonsense... and as I'm going to be out of the office for a while perhaps you can take care of that bit? I think this should be merged now to fix Jenkins