Merge changes from multiprocessing in Python 3.4 (phew)