Merge uuid-ossp 10.8 support from pvh