Merge pull request #2835 from lewurm/fix-make-dist