Cleaned manifest, for real this time
Merge branch 'New-Feature-X'