Merge commit '410d042' into release-0.14 (Fix many tests on 64 bit Python on Windows)