this should address the failure in #2732

This was previously issued against the wrong repository (my fork, rather than ipython - really sorry for the delay caused by that). 

Please don't merge yet - I'm testing on Windows today to confirm the fix there, and will follow up with a comment when that passes.