Fix a subtle error picked up by the 64bit buildbot where a RuntimeError was correctly catched by py.test
Merge branch 'master' into next
Merge branch 'johanhake/fix-issue-54-working-of-numpy-vector-interface-in-parallel'
Fix another subtle error picked up by the 64bit buildbot where a RuntimeError was not correctly catched by py.test
Merge branch 'master' into next