Merge branch 'multiprocessing' into neil