Merge branch 'master' of https://github.com/uqfoundation/dill into new_file_handling

Conflicts:
	tests/test_file.py