Make sure all files are in sdist
Merge branch 'upstream'