Re-vendor distlib
Merge pull request #1844 from pfmoore/distlib-019

Re-vendor distlib
Merge branch '1.5.X' into develop