Rebuild the MANIFEST

A conflict snuck in.
Merge branch 'Test-Builder1.5' into issue/334

Last merge had a broken MANIFEST