Add MANIFEST.in
Merge branch 'master' into dist