Updated U::C paths for fresh Strawberry install
Merge branch 'dev' into ms